diff options
| author | Edin Kadribasic <edink@php.net> | 2003-03-25 11:50:18 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2003-03-25 11:50:18 +0000 |
| commit | 5d381f8f8018692a197297a5fade1794f09f7e92 (patch) | |
| tree | b0a4b647e72665d9d25a03d449f4feefac6b5a8b /sapi/apache2handler/php_functions.c | |
| parent | 14a56343c88a8840d65e67de5af5d9ad978dcafd (diff) | |
| download | php-git-5d381f8f8018692a197297a5fade1794f09f7e92.tar.gz | |
MFB and more. Fixed various win32 compilation issues. Also the sapi
is now built as php4apach2.dll since the filter is being obsoleted.
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 1664528dbe..66ff4892f5 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -18,6 +18,8 @@ /* $Id$ */ +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS + #include "php.h" #include "ext/standard/php_smart_str.h" #include "ext/standard/info.h" @@ -361,8 +363,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 +397,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)); |