mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-26 19:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix problem with sapi_globals being used before it is initialized.

Browse Source
This commit is contained in:
Andi Gutmans 2000-05-05 07:21:48 +00:00
parent 198537b70f
commit 0d194ec80b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sapi/cgi/cgi_main.c
View File

@ -426,6 +426,19 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
#endif /* FORCE_CGI_REDIRECT */
}
if (php_module_startup(&sapi_module)==FAILURE) {
return FAILURE;
}
#ifdef ZTS
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
core_globals = ts_resource(core_globals_id);
sapi_globals = ts_resource(sapi_globals_id);
if (setjmp(EG(bailout))!=0) {
return -1;
}
#endif
if (!cgi) {
while ((c=ap_php_getopt(argc, argv, "c:d:z:g:qvisnaeh?vf:"))!=-1) {
switch (c) {
@ -443,20 +456,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
ap_php_optind = orig_optind;
ap_php_optarg = orig_optarg;
}
if (php_module_startup(&sapi_module)==FAILURE) {
return FAILURE;
}
#ifdef ZTS
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
core_globals = ts_resource(core_globals_id);
sapi_globals = ts_resource(sapi_globals_id);
if (setjmp(EG(bailout))!=0) {
return -1;
}
#endif
init_request_info(SLS_C);
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */