diff options
| author | Thies C. Arntzen <thies@php.net> | 2000-07-10 07:57:01 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2000-07-10 07:57:01 +0000 |
| commit | 1cee6c5b781d791ead0bed07005f6ceea50aa301 (patch) | |
| tree | 88847366ec296a2a5cec5242576a02f8f51cc801 /sapi | |
| parent | bab31955c225ed8461bb053dbee656ddedf168a1 (diff) | |
| download | php-git-1cee6c5b781d791ead0bed07005f6ceea50aa301.tar.gz | |
@- Fixed closing
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/mod_php4.c | 12 | ||||
| -rw-r--r-- | sapi/apache/sapi_apache.c | 7 |
2 files changed, 4 insertions, 15 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 4c1e37c046..6c02699ad2 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -64,7 +64,7 @@ # include "mod_dav.h" #endif -int apache_php_module_main(request_rec *r, int fd, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC); +int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC); void php_save_umask(void); void php_restore_umask(void); int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC); @@ -443,7 +443,7 @@ static char *php_apache_get_default_mimetype(request_rec *r SLS_DC) int send_php(request_rec *r, int display_source_mode, char *filename) { - int fd, retval; + int retval; HashTable *per_dir_conf; SLS_FETCH(); ELS_FETCH(); @@ -480,11 +480,6 @@ int send_php(request_rec *r, int display_source_mode, char *filename) if (filename == NULL) { filename = r->filename; } - /* Open the file */ - if ((fd = popenf(r->pool, filename, O_RDONLY, 0)) == -1) { - log_reason("file permissions deny server access", filename, r); - return FORBIDDEN; - } /* Apache 1.2 has a more complex mechanism for reading POST data */ #if MODULE_MAGIC_NUMBER > 19961007 @@ -518,12 +513,11 @@ int send_php(request_rec *r, int display_source_mode, char *filename) add_cgi_vars(r); init_request_info(SLS_C); - apache_php_module_main(r, fd, display_source_mode CLS_CC ELS_CC PLS_CC SLS_CC); + apache_php_module_main(r, display_source_mode CLS_CC ELS_CC PLS_CC SLS_CC); /* Done, restore umask, turn off timeout, close file and return */ php_restore_umask(); kill_timeout(r); - pclosef(r->pool, fd); return OK; } diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 6db64b5fa4..d9c3c7674b 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -59,23 +59,18 @@ /*#include "mod_php4.h"*/ -int apache_php_module_main(request_rec *r, int fd, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC) +int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC) { zend_file_handle file_handle; if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; } -#ifdef PHP_WIN32 /* sending a file handle to another dll is not working // so let zend open it. */ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.handle.fd = 0; -#else - file_handle.type = ZEND_HANDLE_FD; - file_handle.handle.fd = fd; -#endif file_handle.filename = SG(request_info).path_translated; file_handle.free_filename = 0; |