From: Michael Wallner <mike@php.net>
Date: Wed, 9 Jul 2014 18:34:04 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~27
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=1d87e15edcbcf4b16c5a1aa80ce69229eedb3468;hp=fad3e6cf16fc471895b8016325098079450925e5

Merge branch 'R_2_0'
---

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 418a4c6..501c252 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -1103,7 +1103,11 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	/* useragent */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) {
 		/* don't check strlen, to allow sending no useragent at all */
-		ZVAL_STRING(&opt->defval, "PECL::HTTP/" PHP_PECL_HTTP_VERSION " (PHP/" PHP_VERSION ")", 0);
+		ZVAL_STRING(&opt->defval,
+				"PECL_HTTP/" PHP_PECL_HTTP_VERSION " "
+				"PHP/" PHP_VERSION " "
+				"libcurl/" LIBCURL_VERSION
+			, 0);
 	}
 
 	/* resume */