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, 0 insertions, 10 deletions

diff --git a/main/internal_functions_registry.h b/main/internal_functions_registry.h
index 7152eb8b16..a2d71969e5 100644
--- a/main/internal_functions_registry.h
+++ b/main/internal_functions_registry.h
@@ -25,16 +25,6 @@
 
 extern int php_init_mime(INIT_FUNC_ARGS);
 
-#if 0
-#if APACHE
-extern zend_module_entry apache_module_entry;
-#define phpext_apache_ptr &apache_module_entry
-extern void php_virtual(INTERNAL_FUNCTION_PARAMETERS);
-#else
-#define phpext_apache_ptr NULL
-#endif
-#endif
-
 /* environment functions */
 extern int php_init_environment(void);