archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more apachewin32 work. much better now, but still crashing in zend_execute. At least it's getting the file open now though.

Browse source
This commit is contained in:
Shane Caraveo 2000-05-04 03:28:34 +00:00
parent a85e57ebc3
commit cad04f5579
3 changed files with 32 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sapi/apache/sapi_apache.c
View file

@ -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=&eg;
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;