[PHP-CVS] cvs: php4 /sapi/apache php_apache.c /sapi/apache_hooks php_apache.c

[Ilia Alshanetsky]

iliaa           Fri Dec 27 18:05:15 2002 EDT

  Modified files:              
    /php4/sapi/apache   php_apache.c 
    /php4/sapi/apache_hooks     php_apache.c 
  Log:
  Make the version code get the version from the current Apache, rather then
  the Apache PHP was compiled against.
  
  
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.71 php4/sapi/apache/php_apache.c:1.72
--- php4/sapi/apache/php_apache.c:1.71  Fri Dec 27 17:47:06 2002
+++ php4/sapi/apache/php_apache.c       Fri Dec 27 18:05:13 2002
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.71 2002/12/27 22:47:06 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.72 2002/12/27 23:05:13 iliaa Exp $ */
 
 #include "php_apache_http.h"
 
@@ -507,7 +507,13 @@
    Fetch Apache version */
 PHP_FUNCTION(apache_get_version)
 {
-       RETURN_STRING(SERVER_VERSION, 1);
+       char *apv = (char *) ap_get_server_version();
+
+       if (apv && *apv) {
+               RETURN_STRING(apv, 1);
+       } else {
+               RETURN_FALSE;
+       }
 }
 /* }}} */
 
Index: php4/sapi/apache_hooks/php_apache.c
diff -u php4/sapi/apache_hooks/php_apache.c:1.6 php4/sapi/apache_hooks/php_apache.c:1.7
--- php4/sapi/apache_hooks/php_apache.c:1.6     Fri Dec 27 17:47:06 2002
+++ php4/sapi/apache_hooks/php_apache.c Fri Dec 27 18:05:15 2002
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.6 2002/12/27 22:47:06 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.7 2002/12/27 23:05:15 iliaa Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1916,7 +1916,13 @@
    Fetch Apache version */
 PHP_FUNCTION(apache_get_version)
 {
-       RETURN_STRING(SERVER_VERSION, 1);
+       char *apv = (char *) ap_get_server_version();
+
+       if (apv && *apv) {
+               RETURN_STRING(apv, 1);
+       } else {
+               RETURN_FALSE;
+       }
 }
 /* }}} */
 



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