cvs: php4 /sapi/cgi cgi_main.c /sapi/fastcgi fastcgi.c /sapi/pi3web pi3web_sapi.c /sapi/servlet servlet.c

sebastian Sat Feb 2 14:53:43 2002 EDT Modified files: /php4/sapi/cgi cgi_main.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/servlet servlet.c Log: Remove obsolete CG(extended_info) = 0 calls, we already do this in zend_set_default_compile_time_values(). Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.142 php4/sapi/cgi/cgi_main.c:1.143 --- php4/sapi/cgi/cgi_main.c:1.142 Sun Jan 20 18:58:37 2002 +++ php4/sapi/cgi/cgi_main.c Sat Feb 2 14:53:42 2002 @@ -519,7 +519,6 @@ init_request_info(TSRMLS_C); SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */ - CG(extended_info) = 0; SG(request_info).argv0 = argv0; Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.22 php4/sapi/fastcgi/fastcgi.c:1.23 --- php4/sapi/fastcgi/fastcgi.c:1.22 Fri Jan 4 09:39:46 2002 +++ php4/sapi/fastcgi/fastcgi.c Sat Feb 2 14:53:42 2002 @@ -547,7 +547,6 @@ //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); Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.37 php4/sapi/pi3web/pi3web_sapi.c:1.38 --- php4/sapi/pi3web/pi3web_sapi.c:1.37 Tue Dec 11 10:32:06 2001 +++ php4/sapi/pi3web/pi3web_sapi.c Sat Feb 2 14:53:42 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.37 2001/12/11 15:32:06 sebastian Exp $ */ +/* $Id: pi3web_sapi.c,v 1.38 2002/02/02 19:53:42 sebastian Exp $ */ #include "pi3web_sapi.h" #include "php.h" @@ -77,7 +77,7 @@ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.37 2001/12/11 15:32:06 sebastian Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.38 2002/02/02 19:53:42 sebastian Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -384,7 +384,6 @@ 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); Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.62 php4/sapi/servlet/servlet.c:1.63 --- php4/sapi/servlet/servlet.c:1.62 Tue Dec 11 10:32:09 2001 +++ php4/sapi/servlet/servlet.c Sat Feb 2 14:53:42 2002 @@ -326,11 +326,10 @@ ((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 );