From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 27 Dec 2002 23:05:15 +0000 (+0000)
Subject: Make the version code get the version from the current Apache, rather then
X-Git-Tag: PHP_5_0_dev_before_13561_fix~586
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=097055a86234d8982f43e5ca9ef1a0dc3cbd35c9;p=php

Make the version code get the version from the current Apache, rather then
the Apache PHP was compiled against.
---

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 17d455e773..7cf3bb9d3e 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -507,7 +507,13 @@ PHP_FUNCTION(apache_exec_uri)
    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;
+	}
 }
 /* }}} */
 
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index e8cd54d53b..0d098e385d 100644
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -1916,7 +1916,13 @@ PHP_FUNCTION(apache_exec_uri)
    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;
+	}
 }
 /* }}} */