* Get Apache to work. POST doesn't work yet.

* There are now -I directives for the absolute path of php4, php4/libzend and the builddir for
  the Apache module, so we can #include any php/Zend header.
* Rename config.h to php_config.h

18 files changed, 34 insertions, 14 deletions

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 9b7bbd1899..4c8b1e240e 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include "php.h"
 #include "php3_string.h"
+#include "php_regex.h"
 #include "reg.h"
 
 unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
new file mode 100644
index 0000000000..2d18db721d
--- /dev/null
+++ b/ext/ereg/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/ext/gd/gdcache.c b/ext/gd/gdcache.c
index 3fd82dea70..1662ebb184 100644
--- a/ext/gd/gdcache.c
+++ b/ext/gd/gdcache.c
@@ -40,7 +40,7 @@
 #if (WIN32|WINNT)
 #define HAVE_LIBTTF 1
 #else
-#include "config.h"
+#include "php_config.h"
 #endif
 #if HAVE_LIBTTF
 
diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c
index 39e93ed339..93bb3528d1 100644
--- a/ext/gd/gdttf.c
+++ b/ext/gd/gdttf.c
@@ -7,7 +7,7 @@
 #if WIN32|WINNT
 #include "config.w32.h"
 #else
-#include "config.h"
+#include "php_config.h"
 #endif
 #if HAVE_LIBTTF
 #include <stdio.h>
diff --git a/ext/hyperwave/dlist.c b/ext/hyperwave/dlist.c
index 27c1305664..94dd6edf7b 100644
--- a/ext/hyperwave/dlist.c
+++ b/ext/hyperwave/dlist.c
@@ -18,6 +18,9 @@
 * -----------------
 *
 * $Log$
+* Revision 1.1  1999/04/21 23:11:20  ssb
+* moved apache, com and hyperwave into ext/
+*
 * Revision 1.1.1.1  1999/04/07 21:03:31  zeev
 * PHP 4.0
 *
@@ -48,7 +51,7 @@
 ****************************************************************************/
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif
 
 #if HYPERWAVE
diff --git a/ext/hyperwave/hg_comm.c b/ext/hyperwave/hg_comm.c
index eb10f00f19..9250e20970 100644
--- a/ext/hyperwave/hg_comm.c
+++ b/ext/hyperwave/hg_comm.c
@@ -32,7 +32,7 @@
 #if WIN32|WINNT
 #include "win95nt.h"
 #else
-#include "config.h"
+#include "php_config.h"
 #endif
 
 #if HYPERWAVE
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index dcee8874d5..570e415597 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #if !(WIN32|WINNT)
-#include "config.h"
+#include "php_config.h"
 #endif
 #include "php.h"
 #include "ext/standard/head.h"
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1cc8aa530b..9ad4507c79 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -32,7 +32,7 @@
 
 /* TODO: A lot... */
 
-#include "config.h"
+#include "php_config.h"
 #include "php.h"
 #include "php3_interbase.h"
 
diff --git a/ext/odbc/odbc.c b/ext/odbc/odbc.c
index 3af8798c55..e78a6d4b91 100644
--- a/ext/odbc/odbc.c
+++ b/ext/odbc/odbc.c
@@ -41,7 +41,7 @@
 #if HAVE_UODBC
 
 # if !(WIN32|WINNT)
-#  include "config.h"
+#  include "php_config.h"
 #  include "build-defs.h"
 # endif
   
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index fa38715d25..1d34c2349f 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif
 #include "php.h"
 #include "php3_pgsql.h"
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index f6bc5e80a3..95136da331 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -30,6 +30,7 @@
 #include "php.h"
 #include "php3_browscap.h"
 #include "php_ini.h"
+#include "php_regex.h"
 
 #include "zend_globals.h"
 
diff --git a/ext/standard/post.c b/ext/standard/post.c
index 52260585d9..8258493213 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -320,7 +320,7 @@ void php3_treat_data(int arg, char *str)
 {
 	char *res = NULL, *var, *val;
 	pval *array_ptr;
-	int free_buffer;
+	int free_buffer=0;
 	ELS_FETCH();
 	PLS_FETCH();
 	SLS_FETCH();
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 9b7bbd1899..4c8b1e240e 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include "php.h"
 #include "php3_string.h"
+#include "php_regex.h"
 #include "reg.h"
 
 unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
diff --git a/ext/standard/url.c b/ext/standard/url.c
index a44f01a4dc..e5acd6c578 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -33,8 +33,8 @@
 #include <ctype.h>
 #include <sys/types.h>
 
-/* php.h includes the correct regex.h */
 #include "php.h"
+#include "php_regex.h"
 
 #include "url.h"
 #ifdef _OSD_POSIX
diff --git a/ext/sybase/sybase-ct.c b/ext/sybase/sybase-ct.c
index 58ba286bad..a07c1994ec 100644
--- a/ext/sybase/sybase-ct.c
+++ b/ext/sybase/sybase-ct.c
@@ -32,7 +32,7 @@
 
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif
 #include "php.h"
 #include "php3_sybase-ct.h"
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index 94a8c9ccd1..f52790227f 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -35,7 +35,7 @@
 
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif
 #include "php.h"
 #include "php3_sybase.h"
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 2c2a9ccbc0..4107f1477c 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -36,7 +36,7 @@
  */
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif
 
 #if HAVE_SYSVSEM
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 68547281c5..88678478c7 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -34,7 +34,7 @@
  */
 
 #ifndef MSVC5
-#include "config.h"
+#include "php_config.h"
 #endif