SAPIfication, Episode VI: Return of the SAPI

Remove mostly all references to APACHE and CGI_BINARY from the code.

- Apache include files are no longer included by any PHP code, except for the Apache SAPI module.
- No server specific code is in any of the base PHP code.

Still left to be done:
- Eliminate any references to APACHE from the few remaining modules.
- Move request_info.c's logic to SAPI
- Modify the regex function names, and globals, so that we can always
  include them, without having to fear any interference with Apache;
  Always use the bundled regex library

1 files changed, 1 insertions, 2 deletions

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index be0f445af7..f4dc865163 100644
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -5,10 +5,9 @@
  * REGEX means:
  * 0.. system regex
  * 1.. bundled regex
- * 2.. Apache's regex
  */
 
-#if REGEX == 1
+#if REGEX
 /* get aliases */
 #include "regex/regex_extra.h"
 #include "regex/regex.h"