[PHP-CVS] cvs: php-src /sapi/apache php_apache.c

[Jani Taskinen]

sniper          Tue Sep  9 17:30:49 2003 EDT

  Modified files:              
    /php-src/sapi/apache        php_apache.c 
  Log:
  Show the runtime version of Apache instead of compile time.
  
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.82 php-src/sapi/apache/php_apache.c:1.83
--- php-src/sapi/apache/php_apache.c:1.82       Thu Aug 28 13:48:58 2003
+++ php-src/sapi/apache/php_apache.c    Tue Sep  9 17:30:48 2003
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.82 2003/08/28 17:48:58 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.83 2003/09/09 21:30:48 sniper Exp $ */
 
 #include "php_apache_http.h"
 
@@ -163,6 +163,7 @@
  */
 PHP_MINFO_FUNCTION(apache)
 {
+       char *apv = php_apache_get_version();
        module *modp = NULL;
        char output_buf[128];
 #if !defined(WIN32) && !defined(WINNT)
@@ -195,7 +196,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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php