From: Steph Fox <sfox@php.net>
Date: Mon, 31 Mar 2008 09:42:47 +0000 (+0000)
Subject: - Bring the majority of PECL extensions into line with macro/x.x.x versioning.
X-Git-Tag: RELEASE_1_6_1~8
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=0e7dfa181770723f3a0afd56600282e7385e4419;p=m6w6%2Fext-http

- Bring the majority of PECL extensions into line with macro/x.x.x versioning.
- Please use the -dev tag during the development cycle so that snapshots can easily be distinguished from releases.
---

diff --git a/http.c b/http.c
index 923748d..74d92b2 100644
--- a/http.c
+++ b/http.c
@@ -164,7 +164,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	PHP_EXT_HTTP_VERSION,
+	PHP_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -411,8 +411,8 @@ PHP_MINFO_FUNCTION(http)
 {
 	php_info_print_table_start();
 	{
-		php_info_print_table_row(2, "HTTP Support", "enabled");
-		php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
+		php_info_print_table_header(2, "HTTP Support", "enabled");
+		php_info_print_table_row(2, "Extension Version", PHP_HTTP_VERSION);
 		php_info_print_table_row(2, "Registered Classes",
 #ifndef ZEND_ENGINE_2
 			"none"
diff --git a/http_request_api.c b/http_request_api.c
index e20eb11..bf21eba 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -476,7 +476,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
 		HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
-		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+		HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
 #if HTTP_CURL_VERSION(7,14,1)
diff --git a/php_http.h b/php_http.h
index b561d1d..69ff05a 100644
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "1.6.1"
+#define PHP_HTTP_VERSION "1.6.1-dev"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"