diff options
author | Edin Kadribasic <edink@php.net> | 2003-03-13 22:01:43 +0000 |
---|---|---|
committer | Edin Kadribasic <edink@php.net> | 2003-03-13 22:01:43 +0000 |
commit | f38526321bc40faf8cd3edcb3ac3b4ce0c72fe44 (patch) | |
tree | 14f13b82f49b8a0fe95ecd0e1a1a68d47876db55 /sapi/apache2handler/php_functions.c | |
parent | 288d19ae0ad7013a904576552d0d3677f41ab8db (diff) | |
download | php-git-f38526321bc40faf8cd3edcb3ac3b4ce0c72fe44.tar.gz |
Make apache2 handler produce php4apache2.dll which should work as a
drop in replacement for the filter. Remove max_request_per_child from
minfo() since that function is not exported by win32 version of apache2
lib.
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
-rw-r--r-- | sapi/apache2handler/php_functions.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 6abc6348aa..a725de0f3c 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -361,8 +361,8 @@ PHP_MINFO_FUNCTION(apache) server_rec *serv = ((php_struct *) SG(server_context))->r->server; #if !defined(WIN32) && !defined(WINNT) AP_DECLARE_DATA extern unixd_config_rec unixd_config; -#endif extern int ap_max_requests_per_child; +#endif AP_DECLARE_DATA extern const char *ap_server_root; for (n = 0; ap_loaded_modules[n]; ++n) { @@ -395,9 +395,11 @@ PHP_MINFO_FUNCTION(apache) #if !defined(WIN32) && !defined(WINNT) sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id); php_info_print_table_row(2, "User/Group", tmp); -#endif - sprintf(tmp, "Per Child: %d - Keep Alive: %s - Max Per Connection: %d", ap_max_requests_per_child, (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#else + sprintf(tmp, "Keep Alive: %s - Max Per Connection: %d", (serv->keep_alive ? "on":"off"), serv->keep_alive_max); +#endif + php_info_print_table_row(2, "Max Requests", tmp); sprintf(tmp, "Connection: %lld - Keep-Alive: %lld", (serv->timeout / 1000000), (serv->keep_alive_timeout / 1000000)); |