summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@php.net>2002-02-02 19:53:43 +0000
committerSebastian Bergmann <sebastian@php.net>2002-02-02 19:53:43 +0000
commitdcd4e0a2ec4c3935e51964cf07c097747f6286ef (patch)
treeb6c851152b84504dfd77b343f623844e7107bccc
parentfd884e2bea46244531657526cbf1e32a8bd34f9f (diff)
downloadphp-git-dcd4e0a2ec4c3935e51964cf07c097747f6286ef.tar.gz
Remove obsolete CG(extended_info) = 0 calls, we already do this in zend_set_default_compile_time_values().
-rw-r--r--sapi/cgi/cgi_main.c1
-rw-r--r--sapi/fastcgi/fastcgi.c1
-rw-r--r--sapi/pi3web/pi3web_sapi.c1
-rw-r--r--sapi/servlet/servlet.c3
4 files changed, 1 insertions, 5 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e2a1d96cf9..71fc3289f4 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -519,7 +519,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
init_request_info(TSRMLS_C);
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
- CG(extended_info) = 0;
SG(request_info).argv0 = argv0;
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index 8926eac850..d79f8f1130 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -547,7 +547,6 @@ int main(int argc, char *argv[])
//break;
}
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
- CG(extended_info) = 0;
SG(request_info).argv0 = argv0;
zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 9d56e38916..10394acc65 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -384,7 +384,6 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.opened_path = NULL;
- CG(extended_info) = 0;
init_request_info(lpCB TSRMLS_CC);
php_request_startup(TSRMLS_C);
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index ff648e9f2f..727dd9fe94 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -326,11 +326,10 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
((servlet_request*)SG(server_context))->servlet=self;
((servlet_request*)SG(server_context))->cookies=0;
- CG(extended_info) = 0;
-
/*
* Initialize the request
*/
+
SETSTRING( SG(request_info).auth_user, authUser );
SETSTRING( SG(request_info).request_method, requestMethod );
SETSTRING( SG(request_info).query_string, queryString );