From b89189de6e152e16a078a6deb94d4b215604e3cf Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 4 Sep 2007 16:04:55 +0000
Subject: [PATCH] - release 1.5.5

---
 KnownIssues.txt |  2 ++
 config.w32      |  1 -
 package.xml     | 11 +++++++----
 package2.xml    |  9 ++++++---
 php_http.h      |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/KnownIssues.txt b/KnownIssues.txt
index c6565b2..ca7e2cc 100644
--- a/KnownIssues.txt
+++ b/KnownIssues.txt
@@ -16,3 +16,5 @@ Internals:
 	Inflating raw deflated data causes a re-initialization of the inflate
 		stream where the corresponding window bits are modified to tell libz
 		to not check for zlib header bytes.  This is not preventable AFAICS.
+	LFS dependant parts of libcurl are left out because of off_t,
+		respectively off64_t confusion.
diff --git a/config.w32 b/config.w32
index 95c1e99..1a9b6b0 100644
--- a/config.w32
+++ b/config.w32
@@ -109,7 +109,6 @@ if (PHP_HTTP != "no") {
 		AC_DEFINE("HAVE_CURL_SHARE_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, "");
 		AC_DEFINE("HAVE_CURL_EASY_RESET", 1, "");
-		AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, "");
 		AC_DEFINE("HAVE_CURL_FORMGET", 1, "");
 		AC_DEFINE("HAVE_CURL_MULTI_SETOPT", 1, "");
 		AC_DEFINE("HAVE_CURL_MULTI_TIMEOUT", 1, "");
diff --git a/package.xml b/package.xml
index 85f4df5..db0f04c 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
-<package version="1.0" packagerversion="1.5.1">
+<package version="1.0" packagerversion="1.6.1">
  <name>pecl_http</name>
  <summary>Extended HTTP Support</summary>
  <description>This HTTP extension aims to provide a convenient and powerful 
@@ -23,11 +23,14 @@ support. Parallel requests are available for PHP 5 and greater.
   </maintainer>
   </maintainers>
  <release>
-  <version>1.5.4</version>
-  <date>2007-06-28</date>
+  <version>1.5.5</version>
+  <date>2007-09-04</date>
   <license>BSD, revised</license>
   <state>stable</state>
-  <notes>* Fixed bug #11359 HttpMessage::toMessageTypeObject() does not populate POST fields
+  <notes>* Fixed Bug #11929 (http_negotiate does not return default value on non-match)
+* Fixed SSL library detection for libcurl &gt;= 7.16.2
+- Removed max_recv_speed and max_send_speed request options
+  again, due to LFS dependence
   </notes>
   <deps>
    <dep type="php" rel="ge" version="4.3"/>
diff --git a/package2.xml b/package2.xml
index 73aa5af..2fcea57 100644
--- a/package2.xml
+++ b/package2.xml
@@ -28,9 +28,9 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2007-06-28</date>
+ <date>2007-09-04</date>
  <version>
-  <release>1.5.4</release>
+  <release>1.5.5</release>
   <api>1.5.0</api>
  </version>
  <stability>
@@ -39,7 +39,10 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed bug #11359 HttpMessage::toMessageTypeObject() does not populate POST fields
+* Fixed Bug #11929 (http_negotiate does not return default value on non-match)
+* Fixed SSL library detection for libcurl >= 7.16.2
+- Removed max_recv_speed and max_send_speed request options
+  again, due to LFS dependence
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_http.h b/php_http.h
index a5c9856..9290a25 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.5.4"
+#define PHP_EXT_HTTP_VERSION "1.5.5"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
-- 
2.30.2