cvs: php4 /sapi/apache mod_php4.h php_apache.c

sas Wed Dec 13 05:19:56 2000 EDT Modified files: /php4/sapi/apache mod_php4.h php_apache.c Log: Add apache_child_terminate() and INI setting apache.child_terminate which defaults to 0. Submitted by: Sam Liddicott <sam.liddicott@ananova.com> Index: php4/sapi/apache/mod_php4.h diff -u php4/sapi/apache/mod_php4.h:1.9 php4/sapi/apache/mod_php4.h:1.10 --- php4/sapi/apache/mod_php4.h:1.9 Sun Dec 10 15:22:20 2000 +++ php4/sapi/apache/mod_php4.h Wed Dec 13 05:19:56 2000 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.h,v 1.9 2000/12/10 23:22:20 sas Exp $ */ +/* $Id: mod_php4.h,v 1.10 2000/12/13 13:19:56 sas Exp $ */ #ifndef MOD_PHP4_H #define MOD_PHP4_H @@ -30,6 +30,7 @@ long engine; long last_modified; long xbithack; + long terminate_child; } php_apache_info_struct; extern zend_module_entry apache_module_entry; Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.24 php4/sapi/apache/php_apache.c:1.25 --- php4/sapi/apache/php_apache.c:1.24 Sun Dec 10 15:22:20 2000 +++ php4/sapi/apache/php_apache.c Wed Dec 13 05:19:56 2000 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.24 2000/12/10 23:22:20 sas Exp $ */ +/* $Id: php_apache.c,v 1.25 2000/12/13 13:19:56 sas Exp $ */ #define NO_REGEX_EXTRA_H @@ -67,6 +67,7 @@ PHP_FUNCTION(apachelog); PHP_FUNCTION(apache_note); PHP_FUNCTION(apache_lookup_uri); +PHP_FUNCTION(apache_child_terminate); PHP_MINFO_FUNCTION(apache); @@ -75,6 +76,7 @@ PHP_FE(getallheaders, NULL) PHP_FE(apache_note, NULL) PHP_FE(apache_lookup_uri, NULL) + PHP_FE(apache_child_terminate, NULL) {NULL, NULL, NULL} }; @@ -83,6 +85,7 @@ STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateInt, xbithack, php_apache_info_struct, php_apache_info) STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateInt, engine, php_apache_info_struct, php_apache_info) STD_PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnUpdateInt, last_modified, php_apache_info_struct, php_apache_info) + STD_PHP_INI_ENTRY("child_terminate", "0", PHP_INI_ALL, OnUpdateInt, terminate_child, php_apache_info_struct, php_apache_info) PHP_INI_END() @@ -106,6 +109,20 @@ zend_module_entry apache_module_entry = { "apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; + +/* {{{ proto string child_terminate() + Get and set Apache request notes */ +PHP_FUNCTION(apache_child_terminate) +{ + APLS_FETCH(); + + if (AP(terminate_child)) { + ap_child_terminate( ((request_rec *)SG(server_context)) ); + } else { /* tell them to get lost! */ + php_error(E_WARNING, "apache.child_terminate is disabled"); + } +} +/* }}} */ /* {{{ proto string apache_note(string note_name [, string note_value]) Get and set Apache request notes */