diff options
| author | Shane Caraveo <shane@php.net> | 2000-05-04 03:28:34 +0000 |
|---|---|---|
| committer | Shane Caraveo <shane@php.net> | 2000-05-04 03:28:34 +0000 |
| commit | cad04f55792bf247665fcddd4b9f7ca87040ce30 (patch) | |
| tree | 8e4a895538f6ccda8d2e6a6745d05b51a66d80e4 /sapi/apache/sapi_apache.c | |
| parent | a85e57ebc32a1ec1ae5bda19dfe5f716c18c02f2 (diff) | |
| download | php-git-cad04f55792bf247665fcddd4b9f7ca87040ce30.tar.gz | |
more apachewin32 work. much better now, but still crashing in zend_execute. At least it's getting the file open now though.
Diffstat (limited to 'sapi/apache/sapi_apache.c')
| -rw-r--r-- | sapi/apache/sapi_apache.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c index 3639332773..6a42f563e4 100644 --- a/sapi/apache/sapi_apache.c +++ b/sapi/apache/sapi_apache.c @@ -24,7 +24,6 @@ #define NO_REGEX_EXTRA_H #ifdef WIN32 #include <winsock2.h> -#define PHP_EXPORTS #include <stddef.h> #endif @@ -60,27 +59,23 @@ /*#include "mod_php4.h"*/ -PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mode SLS_DC) +int apache_php_module_main(request_rec *r, int fd, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC) { zend_file_handle file_handle; -#ifdef ZTS - zend_compiler_globals cg; - zend_executor_globals eg; - php_core_globals pcg; - - zend_compiler_globals *compiler_globals=&cg; - zend_executor_globals *executor_globals=⪚ - php_core_globals *core_globals=&pcg; - memset(&cg,0,sizeof(zend_compiler_globals)); - memset(&eg,0,sizeof(zend_executor_globals)); - memset(&pcg,0,sizeof(php_core_globals)); -#endif 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; |