Remove obsolete CG(extended_info) = 0 calls, we already do this in zend_set_default_c...

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e2a1d96cf976e73b412eb35874e1b425681232df..71fc3289f413a6c5aa141c2e630d14e5a07a316d 100644 (file)
--- 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 8926eac85089066a036ce00fc27386d5ff82412b..d79f8f11307dee66a77dd8f8ea61fea54c79dc85 100644 (file)
--- 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 9d56e3891653b58ffe5020e6a35962d0e3c32736..10394acc657e7b138e0436797337ec9b972827a2 100644 (file)
--- 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 ff648e9f2f295bcd252df64e6cde72a4f8e0b5ac..727dd9fe941484ace9621a0e55959bdb3172377f 100644 (file)
--- 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 );