cvs: php4 /sapi/apache php_apache.c
| From: | Hartmut Holzgraefe | Date: | Tue, 23 Apr 2002 11:40:20 +0000 |
| Subject: | cvs: php4 /sapi/apache php_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11341@lists.php.net to get a copy of this message | ||
hholzgra Tue Apr 23 07:40:20 2002 EDT
Modified files:
/php4/sapi/apache php_apache.c
Log:
apache_child_terminate() returns status as bool
proto fixes
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.57 php4/sapi/apache/php_apache.c:1.58
--- php4/sapi/apache/php_apache.c:1.57 Mon Apr 22 23:01:30 2002
+++ php4/sapi/apache/php_apache.c Tue Apr 23 07:40:19 2002
@@ -17,7 +17,7 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.57 2002/04/23 03:01:30 sniper Exp $ */
+/* $Id: php_apache.c,v 1.58 2002/04/23 11:40:19 hholzgra Exp $ */
#include "php_apache_http.h"
@@ -105,18 +105,21 @@
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 @@
}
/* }}} */
-/* {{{ 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 @@
}
/* }}} */
-/* {{{ 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 @@
}
/* }}} */
-/* {{{ 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)
{