From: Michael Wallner <mike@php.net>
Date: Thu, 10 Dec 2009 15:09:14 +0000 (+0000)
Subject: prepare 1.6.6
X-Git-Tag: RELEASE_1_6_6~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=36e9f113c01264421980b2d3d73931077376fa45;p=m6w6%2Fext-http

prepare 1.6.6
---

diff --git a/http_request_api.c b/http_request_api.c
index 176dc29..14734b9 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -462,6 +462,8 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 #if HTTP_CURL_VERSION(7,19,1)
 		HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL);
 		HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, NULL);
+#else
+		HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL);
 #endif
 		HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L);
@@ -491,6 +493,8 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 #if HTTP_CURL_VERSION(7,19,1)
 		HTTP_CURL_OPT(CURLOPT_USERNAME, NULL);
 		HTTP_CURL_OPT(CURLOPT_PASSWORD, NULL);
+#else
+		HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
 #endif
 		HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L);
 		HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
@@ -506,8 +510,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
 		HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L);
+		/* these options would enable curl's cookie engine by default which we don't want
 		HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
-		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL);
+		HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); */
 #if HTTP_CURL_VERSION(7,14,1)
 		HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif
diff --git a/package2.xml b/package2.xml
index fd5f10e..fecba00 100644
--- a/package2.xml
+++ b/package2.xml
@@ -28,7 +28,7 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2009-08-13</date>
+ <date>2009-12-10</date>
  <version>
   <release>1.6.6</release>
   <api>1.6.0</api>
@@ -39,8 +39,11 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
+* Fixed a Last-Modified caching bug in http_send API
+* Fixed bug with HttpRequestPool and libevent when adding requests while running
+* Fixed memory leak in HttpResponse::getStream() (Felipe Pena)
+* Fixed bug #14382 (PHP crash after casting scalar argument to an array in HttpQueryString)
 * Fixed bug #16533 (http_redirect fails with url->port==0)
-* Fixed bug #16817 (Proxy-Auth. and WWW-Auth. credentials mixed after connection reuse)
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index 5208da3..0271ad8 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_HTTP_VERSION "1.6.6dev"
+#define PHP_HTTP_VERSION "1.6.6"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"