From: Michael Wallner <mike@php.net>
Date: Wed, 7 Sep 2016 06:01:09 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=faf7a7899fa8ffb24f8105a921f359d6b97ec34e;p=m6w6%2Fext-http

Merge branch 'v2.6.x'
---

faf7a7899fa8ffb24f8105a921f359d6b97ec34e
diff --cc package.xml
index e104c7e,0e22066..f8d65e0
--- a/package.xml
+++ b/package.xml
@@@ -31,10 -31,10 +31,10 @@@ https://mdref.m6w6.name/htt
    <email>mike@php.net</email>
    <active>yes</active>
   </lead>
-  <date>2016-08-22</date>
+  <date>2016-09-07</date>
   <version>
 -  <release>2.6.0beta2</release>
 -  <api>2.6.0</api>
 +  <release>3.1.0beta2</release>
 +  <api>3.1.0</api>
   </version>
   <stability>
    <release>beta</release>
@@@ -64,7 -64,11 +64,10 @@@
  * Fix gh-issue #36: Unexpected cookies sent if persistent_handle_id is used (Mike, @rcanavan, @afflerbach)
  * Fix gh-issue #34: allow setting multiple headers with the same name (Mike, @rcanavan)
  * Fix gh-issue #33: allow setting prodyhost request option to NULL (Mike, @rcanavan)
 -* Fix gh-issue #31: add/improve configure checks for default CA bundle/path (Mike, @rcanavan) 
 +* Fix gh-issue #31: add/improve configure checks for default CA bundle/path (Mike, @rcanavan)
+ 
+ Changes from beta1:
 -* Fixed PHP-5.3 compatibility
+ * Fixed recursive calls to the event loop dispatcher
  ]]></notes>
   <contents>
    <dir name="/">
diff --cc scripts/gen_travis_yml.php
index f83d0b4,0bbda36..311a4cd
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@@ -22,9 -22,7 +22,7 @@@ $env = $gen(
  	"enable_maintainer_zts",
  	"enable_json",
  	"enable_hash" => ["yes"],
 -	"enable_iconv" => ["yes"]
 +	"enable_iconv" => ["yes"],
- 	"enable_phar" => ["yes"],
- 	"enable_posix" => ["yes"]
  ]);
  foreach ($env as $e) {
  	printf(" - %s\n", $e);
diff --cc src/php_http_client_curl_user.c
index 225ce1c,f4a9958..66edae6
--- a/src/php_http_client_curl_user.c
+++ b/src/php_http_client_curl_user.c
@@@ -252,15 -283,11 +252,16 @@@ php_http_client_curl_ops_t *php_http_cl
  	return &php_http_client_curl_user_ops;
  }
  
 -zend_class_entry *php_http_client_curl_user_class_entry;
 +static zend_class_entry *php_http_client_curl_user_class_entry;
 +
 +zend_class_entry *php_http_client_curl_user_get_class_entry()
 +{
 +	return php_http_client_curl_user_class_entry;
 +}
  
  ZEND_BEGIN_ARG_INFO_EX(ai_init, 0, 0, 1)
- 	ZEND_ARG_TYPE_INFO(0, run, IS_CALLABLE, 0)
+ 	/* using IS_CALLABLE type hint would create a forwards compatibility break */
+ 	ZEND_ARG_INFO(0, run)
  ZEND_END_ARG_INFO();
  ZEND_BEGIN_ARG_INFO_EX(ai_timer, 0, 0, 1)
  #if PHP_VERSION_ID >= 70000
diff --cc tests/client029.phpt
index 70f1005,2ed6d79..1c8dc4f
--- a/tests/client029.phpt
+++ b/tests/client029.phpt
@@@ -25,7 -23,7 +25,7 @@@ class UserHandler implements http\Clien
  		$this->client = $client;
  	}
  	
--	function init(callable $run) {
++	function init($run) {
  		$this->run = $run;
  	}
  	
diff --cc tests/gh-issue47.phpt
index 1a09b8d,3378b62..29205ec
--- a/tests/gh-issue47.phpt
+++ b/tests/gh-issue47.phpt
@@@ -8,12 -8,12 +8,12 @@@ include "skipif.inc"
  <?php
  echo "Test\n";
  
- $urls = [
+ $urls = array(
      "",
      "? = ="
- ];
+ );
  
 -$url0=new http\Url($urls[0]);
 +$url0=new http\Url($urls[0], null, http\Url::FROM_ENV);
  $url1=$url0->mod($urls[1]);
  
  echo $url1;
diff --cc tests/gh-issue50.phpt
index 6cef7d9,91310cb..52c7648
--- a/tests/gh-issue50.phpt
+++ b/tests/gh-issue50.phpt
@@@ -30,10 -30,10 +30,10 @@@ try 
  ===DONE===
  --EXPECTF--
  Test
 -exception 'http\Exception\RuntimeException' with message 'http\Client::dequeue(): Could not dequeue request while executing callbacks' in %sgh-issue50.php:9
 +http\Exception\RuntimeException: http\Client::dequeue(): Could not dequeue request while executing callbacks in %sgh-issue50.php:9
  Stack trace:
  #0 %sgh-issue50.php(9): http\Client->dequeue(Object(http\Client\Request))
- #1 [internal function]: {closure}(Object(http\Client), Object(http\Client\Request), 18, 'GET / HTTP/1.1\r...')
+ #1 [internal function]: {closure}(Object(http\Client), Object(http\Client\Request), 18, 'GET / HTTP/1.1%s...')
  #2 %sgh-issue50.php(14): http\Client->send()
  #3 {main}
  ===DONE===