cvs: php-src(PHP_4_3) /sapi/apache php_apache.c

From: Date: Tue, 09 Sep 2003 21:42:57 +0000
Subject: cvs: php-src(PHP_4_3) /sapi/apache php_apache.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-23721@lists.php.net to get a copy of this message
sniper Tue Sep 9 17:42:57 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache php_apache.c Log: MFH: runtime apache version Index: php-src/sapi/apache/php_apache.c diff -u php-src/sapi/apache/php_apache.c:1.69.2.4 php-src/sapi/apache/php_apache.c:1.69.2.5 --- php-src/sapi/apache/php_apache.c:1.69.2.4 Thu Aug 28 13:49:08 2003 +++ php-src/sapi/apache/php_apache.c Tue Sep 9 17:42:57 2003 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.69.2.4 2003/08/28 17:49:08 iliaa Exp $ */ +/* $Id: php_apache.c,v 1.69.2.5 2003/09/09 21:42:57 sniper Exp $ */ #include "php_apache_http.h" @@ -44,6 +44,7 @@ PHP_FUNCTION(apache_lookup_uri); PHP_FUNCTION(apache_child_terminate); PHP_FUNCTION(apache_setenv); +PHP_FUNCTION(apache_get_version); PHP_MINFO_FUNCTION(apache); @@ -55,6 +56,7 @@ PHP_FE(apache_child_terminate, NULL) PHP_FE(apache_setenv, NULL) PHP_FE(apache_response_headers, NULL) + PHP_FE(apache_get_version, NULL) PHP_FALIAS(getallheaders, apache_request_headers, NULL) {NULL, NULL, NULL} }; @@ -74,7 +76,6 @@ apache_globals->in_request = 0; } - static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS @@ -158,6 +159,7 @@ */ PHP_MINFO_FUNCTION(apache) { + char *apv = (char *) ap_get_server_version(); module *modp = NULL; char output_buf[128]; #if !defined(WIN32) && !defined(WINNT) @@ -174,7 +176,6 @@ serv = ((request_rec *) SG(server_context))->server; - php_info_print_table_start(); #ifdef PHP_WIN32 @@ -190,7 +191,9 @@ php_info_print_table_row(2, "APACHE_TARGET", PHP_APACHE_TARGET); #endif - php_info_print_table_row(2, "Apache Version", SERVER_VERSION); + if (apv && *apv) { + php_info_print_table_row(2, "Apache Version", apv); + } #ifdef APACHE_RELEASE sprintf(output_buf, "%d", APACHE_RELEASE); @@ -474,6 +477,19 @@ } /* }}} */ +/* {{{ proto string apache_get_version(void) + Fetch Apache version */ +PHP_FUNCTION(apache_get_version) +{ + char *apv = (char *) ap_get_server_version(); + + if (apv && *apv) { + RETURN_STRING(apv, 1); + } else { + RETURN_FALSE; + } +} +/* }}} */ #if 0 This function is most likely a bad idea. Just playing with it for now.

« previous php.cvs (#23721) next »