diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/alloca.c | 2 | ||||
| -rw-r--r-- | main/main.c | 5 | ||||
| -rw-r--r-- | main/php.h | 12 | ||||
| -rw-r--r-- | main/php_regex.h | 14 | ||||
| -rw-r--r-- | main/snprintf.c | 2 |
5 files changed, 19 insertions, 16 deletions
diff --git a/main/alloca.c b/main/alloca.c index aa512d9a1c..a520f2c834 100644 --- a/main/alloca.c +++ b/main/alloca.c @@ -21,7 +21,7 @@ allocating any. It is a good idea to use alloca(0) in your main control loop, etc. to force garbage collection. */ -#include <config.h> +#include "php_config.h" #if !HAVE_ALLOCA diff --git a/main/main.c b/main/main.c index 1f3303304d..006032f498 100644 --- a/main/main.c +++ b/main/main.c @@ -921,6 +921,7 @@ int _php3_hash_environment(PLS_D ELS_DC) case 'g': case 'G': if (!_gpc_flags[2]) { + printf("Parsing GET data: '%s'\n", SG(request_info).query_string); php3_treat_data(PARSE_GET, NULL); /* GET Data */ _gpc_flags[2]=1; } @@ -1188,7 +1189,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_ /* some systems are missing these from their header files */ #if APACHE -PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mode) +PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mode SLS_DC) { zend_file_handle file_handle; #ifdef ZTS @@ -1201,8 +1202,6 @@ PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mo #endif SLS_FETCH(); - SG(server_context) = r; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; } diff --git a/main/php.h b/main/php.h index f40528ea00..e7df9ae5ad 100644 --- a/main/php.h +++ b/main/php.h @@ -75,7 +75,7 @@ extern unsigned char second_arg_allow_ref[]; # define PHPAPI __declspec(dllimport) # endif #else -#include "config.h" +#include "php_config.h" #define PHPAPI #define THREAD_LS #endif @@ -151,16 +151,6 @@ typedef zval pval; #define pval_copy_constructor zval_copy_ctor #define pval_destructor zval_dtor -#if REGEX -#include "regex/regex.h" -#define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ -#define _RX_H 1 /* Try defining these for Linux to */ -#define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */ -#define _H_REGEX 1 /* This one is for AIX */ -#else -#include <regex.h> -#endif - #if STDC_HEADERS # include <string.h> #else diff --git a/main/php_regex.h b/main/php_regex.h new file mode 100644 index 0000000000..2d18db721d --- /dev/null +++ b/main/php_regex.h @@ -0,0 +1,14 @@ +#ifndef _PHP_REGEX_H +#define _PHP_REGEX_H + +#if REGEX +#include "regex/regex.h" +#define _REGEX_H 1 /* this should stop Apache from loading the system version of regex.h */ +#define _RX_H 1 /* Try defining these for Linux to */ +#define __REGEXP_LIBRARY_H__ 1 /* avoid Apache including regex.h */ +#define _H_REGEX 1 /* This one is for AIX */ +#else +#include <regex.h> +#endif + +#endif /* _PHP_REGEX_H */
\ No newline at end of file diff --git a/main/snprintf.c b/main/snprintf.c index 32bff374e2..9c6a552f61 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -53,7 +53,7 @@ * <panos@alumni.cs.colorado.edu> for xinetd. */ -#include "config.h" +#include "php_config.h" #if !defined(APACHE) || (!APACHE) #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) |