be cautious about the result of strrchr
fix failing test on Linux build
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix failing test on Linux build
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix failing test on Linux build
Merge branch 'PHP-5.4'

Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
Merge branch 'master' of ssh://git.php.net/php-src
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Add missing zend_do_free call

This is a followup to d53f1bf8ab. When the yield *statement* is used its
return value still needs to be freed.
Merge branch 'PHP-5.5'
Update release date
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of ssh://git.php.net/php-src
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed bug #55438 (Curlwapper is not sending http header randomly)

Since curl multi is used, it sometime happen that the resource is freed before
the curl multi really execute the query. The patch will store the headers
slist in the curlstream handle and free it only when the stream will be closed
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)