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

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 86bab41fa2..5d23a64ab6 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -22,6 +22,7 @@
 #include "zend.h"
 #include "php.h"
 #include "php_variables.h"
+#include "SAPI.h"
 
 #include "httpd.h"
 #include "http_config.h"
@@ -299,6 +300,7 @@ static int php_apache_sapi_activate(SLS_D)
 	block_alarms();
 	register_cleanup(((request_rec *) SG(server_context))->pool, NULL, php_request_shutdown, php_request_shutdown_for_exec);
 	unblock_alarms();
+	return SUCCESS;
 }
 
 
@@ -310,9 +312,7 @@ static struct stat *php_apache_get_stat(SLS_D)
 
 static char *php_apache_getenv(char *name, int name_len SLS_DC)
 {
-	char *value;
-
-	return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, name));
+	return (char *) table_get(((request_rec *) SG(server_context))->subprocess_env, name);
 }