summaryrefslogtreecommitdiff
path: root/sapi/apache/php_apache.c
diff options
context:
space:
mode:
authorHartmut Holzgraefe <hholzgra@php.net>2002-04-23 11:40:19 +0000
committerHartmut Holzgraefe <hholzgra@php.net>2002-04-23 11:40:19 +0000
commit4852dd35697a7fd6a0c55308a9dd125395ce52be (patch)
tree10613ce2a3c64b612715a266e019522c8d1d67ce /sapi/apache/php_apache.c
parent417f299d0e7827c07e8f9cf9dd4fc85f5a340907 (diff)
downloadphp-git-4852dd35697a7fd6a0c55308a9dd125395ce52be.tar.gz
apache_child_terminate() returns status as bool
proto fixes
Diffstat (limited to 'sapi/apache/php_apache.c')
-rw-r--r--sapi/apache/php_apache.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index b1a5b0e6d3..b7572922b5 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -105,18 +105,21 @@ zend_module_entry apache_module_entry = {
STANDARD_MODULE_PROPERTIES
};
-/* {{{ proto string apache_child_terminate()
+/* {{{ proto bool string apache_child_terminate(void)
Terminate apache process after this request */
PHP_FUNCTION(apache_child_terminate)
{
#ifndef MULTITHREAD
if (AP(terminate_child)) {
ap_child_terminate( ((request_rec *)SG(server_context)) );
+ RETURN_TRUE;
} else { /* tell them to get lost! */
php_error(E_WARNING, "apache.child_terminate is disabled");
+ RETURN_FALSE;
}
#else
php_error(E_WARNING, "apache_child_terminate() is not supported in this build");
+ RETURN_FALSE;
#endif
}
/* }}} */
@@ -271,7 +274,7 @@ PHP_MINFO_FUNCTION(apache)
}
/* }}} */
-/* {{{ proto int virtual(string filename)
+/* {{{ proto bool virtual(string filename)
Perform an Apache sub-request */
/* This function is equivalent to <!--#include virtual...-->
* in mod_include. It does an Apache sub-request. It is useful
@@ -343,7 +346,7 @@ PHP_FUNCTION(getallheaders)
}
/* }}} */
-/* {{{ proto int apache_setenv(string variable, string value [, boolean walk_to_top])
+/* {{{ proto bool apache_setenv(string variable, string value [, bool walk_to_top])
Set an Apache subprocess_env variable */
PHP_FUNCTION(apache_setenv)
{
@@ -365,7 +368,7 @@ PHP_FUNCTION(apache_setenv)
}
/* }}} */
-/* {{{ proto class apache_lookup_uri(string URI)
+/* {{{ proto object apache_lookup_uri(string URI)
Perform a partial request of the given URI to obtain information about it */
PHP_FUNCTION(apache_lookup_uri)
{