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, 3 deletions

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index e9988594e6..0915feb7c8 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#if APACHE
+#include "remains.h"
 #include "http_request.h"
 #include "build-defs.h"
 
@@ -440,8 +440,6 @@ PHP_FUNCTION(apache_exec_uri)
 }
 #endif
 
-#endif
-
 /*
  * Local variables:
  * tab-width: 4