cvs: php4 /sapi/apache sapi_apache.c
| From: | Rasmus Lerdorf | Date: | Thu, 06 Sep 2001 23:35:39 +0000 |
| Subject: | cvs: php4 /sapi/apache sapi_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7259@lists.php.net to get a copy of this message | ||
rasmus Thu Sep 6 19:35:39 2001 EDT
Modified files:
/php4/sapi/apache sapi_apache.c
Log:
Damn, went to head instead of the branch - revert
Index: php4/sapi/apache/sapi_apache.c
diff -u php4/sapi/apache/sapi_apache.c:1.34 php4/sapi/apache/sapi_apache.c:1.35
--- php4/sapi/apache/sapi_apache.c:1.34 Thu Sep 6 19:32:59 2001
+++ php4/sapi/apache/sapi_apache.c Thu Sep 6 19:35:39 2001
@@ -19,7 +19,7 @@
| Stig Bakken <ssb@fast.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.34 2001/09/06 23:32:59 rasmus Exp $ */
+/* $Id: sapi_apache.c,v 1.35 2001/09/06 23:35:39 rasmus Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -99,40 +99,6 @@
return (OK);
}
/* }}} */
-
-/* {{{ apache_php_module_hook
- */
-int apache_php_module_hook(request_rec *r, char *filename, zval **ret TSRMLS_DC)
-{
- zend_file_handle file_handle;
-
-#if PHP_SIGCHILD
- signal(SIGCHLD, sigchld_handler);
-#endif
-
- if (php_request_startup_for_hook(TSRMLS_C) == FAILURE) {
- return FAILURE;
- }
-
- /* Add PHP_SELF_HOOK - Absolute path */
- php_register_variable("PHP_SELF_HOOK", filename, PG(http_globals)[TRACK_VARS_SERVER]
TSRMLS_CC);
-
- file_handle.type = ZEND_HANDLE_FILENAME;
- file_handle.handle.fd = 0;
- file_handle.filename = filename;
- file_handle.opened_path = NULL;
- file_handle.free_filename = 0;
-
- (void) php_execute_simple_script(&file_handle, ret TSRMLS_CC);
-
- AP(in_request) = 0;
-
- zend_try {
- php_request_shutdown_for_hook(NULL);
- } zend_end_try();
-
- return (OK);
-}
/*
* Local variables: