From: Sascha Schumann <sas@php.net>
Date: Sat, 12 Feb 2000 14:48:09 +0000 (+0000)
Subject: Never use Apache regex stuff
X-Git-Tag: BEFORE_SAPI_POST_PATCH_17_FEB_2000~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfe09e8305cf0fd4d021519b745d0b7a3b5e3bc5;p=php

Never use Apache regex stuff
---

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 05ade912aa..840bc3adb7 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -186,7 +186,6 @@ AC_ARG_WITH(apache,
 ])
 
 INCLUDES="$INCLUDES $APACHE_INCLUDE"
-dnl## PHP_SUBST(APACHE_INCLUDE)
 fi
 
 if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
@@ -211,21 +210,7 @@ AC_ARG_WITH(mod_charset,
 	AC_MSG_RESULT(no)
 ])
 
-if test "$with_regex" = "apache" && test -z "$APACHE_HAS_REGEX"; then
-  with_regex=php
-fi
-
-if test -z "$with_regex" && test -n "$APACHE_HAS_REGEX"; then
-  with_regex=apache
-fi
-
 if test -n "$APACHE_MODULE"; then
-  if test "$with_regex" = "apache"; then
-    APACHE_WANT_HSREGEX=yes
-  else
-    APACHE_WANT_HSREGEX=no
-  fi
-  PHP_SUBST(APACHE_WANT_HSREGEX)
   PHP_APACHE_CHECK_RDYNAMIC
   PHP_OUTPUT(sapi/apache/libphp4.module)
   PHP_BUILD_STATIC
diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp4.module.in
index 4c90861a65..0cefcf1fae 100644
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp4.module.in
@@ -1,6 +1,6 @@
 Name: php4_module
 ConfigStart
-	RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@
+	RULE_WANTHSREGEX=no
 	LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS"
 	RULE_HIDE=yes
 	CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@"