cvs: php4 /sapi/apache mod_php4.c php_apache.c php_apache_http.h sapi_apache.c

sniper Mon Apr 22 23:01:31 2002 EDT Modified files: /php4/sapi/apache mod_php4.c php_apache.c php_apache_http.h sapi_apache.c Log: Part 4 of apache sapi build fixes: - Fixed many conflicts caused by bogus includes, e.g the infamous XtOffset redefinition warning is gone now. Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.127 php4/sapi/apache/mod_php4.c:1.128 --- php4/sapi/apache/mod_php4.c:1.127 Tue Dec 11 10:31:53 2001 +++ php4/sapi/apache/mod_php4.c Mon Apr 22 23:01:30 2002 @@ -17,48 +17,9 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.127 2001/12/11 15:31:53 sebastian Exp $ */ +/* $Id: mod_php4.c,v 1.128 2002/04/23 03:01:30 sniper Exp $ */ -#define NO_REGEX_EXTRA_H -#ifdef WIN32 -#include <winsock2.h> -#include <stddef.h> -#endif - -#include "zend.h" -#include "php.h" -#include "php_variables.h" - -#include "httpd.h" -#include "http_config.h" -#if MODULE_MAGIC_NUMBER > 19980712 -# include "ap_compat.h" -#else -# if MODULE_MAGIC_NUMBER > 19980324 -# include "compat.h" -# endif -#endif -#include "http_core.h" -#include "http_main.h" -#include "http_protocol.h" -#include "http_request.h" -#include "http_log.h" - -#include "php_ini.h" -#include "php_globals.h" -#include "SAPI.h" -#include "php_main.h" - -#include "zend_compile.h" -#include "zend_execute.h" -#include "zend_highlight.h" -#include "zend_indent.h" - -#include "ext/standard/php_standard.h" - -#include "util_script.h" - -#include "mod_php4.h" +#include "php_apache_http.h" #undef shutdown @@ -434,7 +395,7 @@ authorization = table_get(r->headers_in, "Authorization"); } if (authorization -/* && !auth_type(r) */ + && !auth_type(r) && !strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) { tmp = uudecode(r->pool, authorization); SG(request_info).auth_user = getword_nulls_nc(r->pool, &tmp, ':'); Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.56 php4/sapi/apache/php_apache.c:1.57 --- php4/sapi/apache/php_apache.c:1.56 Thu Feb 28 03:27:19 2002 +++ php4/sapi/apache/php_apache.c Mon Apr 22 23:01:30 2002 @@ -17,45 +17,21 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.56 2002/02/28 08:27:19 sebastian Exp $ */ - -#define NO_REGEX_EXTRA_H - -#ifdef WIN32 -#include <winsock2.h> -#include <stddef.h> -#endif - -#include "php.h" -#include "ext/standard/head.h" -#include "php_globals.h" -#include "php_ini.h" -#include "SAPI.h" -#include "mod_php4.h" -#include "ext/standard/info.h" - -#include <stdlib.h> -#if HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <string.h> -#include <errno.h> -#include <ctype.h> +/* $Id: php_apache.c,v 1.57 2002/04/23 03:01:30 sniper Exp $ */ #include "php_apache_http.h" -#include "http_request.h" - -#ifdef ZTS -int php_apache_info_id; -#else -php_apache_info_struct php_apache_info; -#endif #ifdef PHP_WIN32 #include "zend.h" #include "ap_compat.h" #else #include "build-defs.h" +#endif + +#ifdef ZTS +int php_apache_info_id; +#else +php_apache_info_struct php_apache_info; #endif #define SECTION(name) PUTS("<H2 align=\"center\">" name "</H2>\n") Index: php4/sapi/apache/php_apache_http.h diff -u php4/sapi/apache/php_apache_http.h:1.1 php4/sapi/apache/php_apache_http.h:1.2 --- php4/sapi/apache/php_apache_http.h:1.1 Thu Feb 10 14:41:20 2000 +++ php4/sapi/apache/php_apache_http.h Mon Apr 22 23:01:30 2002 @@ -1,24 +1,34 @@ -# if HAVE_AP_CONFIG_H -#include "ap_config_auto.h" -#ifdef RHAPSODY -#undef HAVE_SNPRINTF +#define NO_REGEX_EXTRA_H + +#ifdef WIN32 +#include <winsock2.h> +#include <stddef.h> #endif -#include "ap_config.h" -#ifdef RHAPSODY -#undef HAVE_SNPRINTF -#define HAVE_SNPRINTF 1 -#endif -# endif -# if HAVE_OLD_COMPAT_H -#include "compat.h" -# endif -# if HAVE_AP_COMPAT_H -#include "ap_compat.h" -# endif + +#include "zend.h" +#include "php_regex.h" + #include "httpd.h" -#include "http_main.h" -#include "http_core.h" -#include "http_request.h" -#include "http_protocol.h" #include "http_config.h" -#include "http_log.h" + +#if MODULE_MAGIC_NUMBER > 19980712 +# include "ap_compat.h" +#else +# if MODULE_MAGIC_NUMBER > 19980324 +# include "compat.h" +# endif +#endif + +#include "http_core.h" +#include "http_main.h" +#include "http_protocol.h" +#include "http_request.h" +#include "http_log.h" +#include "util_script.h" + +#include "php_variables.h" +#include "php_main.h" +#include "php_ini.h" +#include "ext/standard/php_standard.h" + +#include "mod_php4.h" Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.39 php4/sapi/apache/sapi_apache.c:1.40 --- php4/sapi/apache/sapi_apache.c:1.39 Tue Dec 11 10:31:55 2001 +++ php4/sapi/apache/sapi_apache.c Mon Apr 22 23:01:30 2002 @@ -19,44 +19,9 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.39 2001/12/11 15:31:55 sebastian Exp $ */ +/* $Id: sapi_apache.c,v 1.40 2002/04/23 03:01:30 sniper Exp $ */ -#define NO_REGEX_EXTRA_H -#ifdef WIN32 -#include <winsock2.h> -#include <stddef.h> -#endif - -#include "php.h" - -#include "httpd.h" -#include "http_config.h" -#if MODULE_MAGIC_NUMBER > 19980712 -# include "ap_compat.h" -#else -# if MODULE_MAGIC_NUMBER > 19980324 -# include "compat.h" -# endif -#endif -#include "http_core.h" -#include "http_main.h" -#include "http_protocol.h" -#include "http_request.h" -#include "http_log.h" - -#include "zend.h" -#include "php_ini.h" -#include "php_globals.h" -#include "SAPI.h" -#include "php_main.h" -#include "zend_compile.h" -#include "zend_execute.h" -#include "zend_highlight.h" -#include "zend_indent.h" -#include "ext/standard/php_standard.h" -#include "util_script.h" -#include "php_version.h" -#include "mod_php4.h" +#include "php_apache_http.h" /* {{{ apache_php_module_main */