cvs: php4(apache_hooks) /sapi/apache sapi_apache.c

rasmus Thu Sep 6 19:39:02 2001 EDT Modified files: (Branch: apache_hooks) /php4/sapi/apache sapi_apache.c Log: Ok, get it onto the right branch (cvs can get annoying sometimes) Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.33 php4/sapi/apache/sapi_apache.c:1.33.4.1 --- php4/sapi/apache/sapi_apache.c:1.33 Sat Aug 4 21:42:45 2001 +++ php4/sapi/apache/sapi_apache.c Thu Sep 6 19:39:02 2001 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.33 2001/08/05 01:42:45 zeev Exp $ */ +/* $Id: sapi_apache.c,v 1.33.4.1 2001/09/06 23:39:02 rasmus Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -99,6 +99,40 @@ 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: