Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the test for curl 7.29.0+

Author: weltling

ext/curl/tests/curl_error_basic.phpt

@@ -38,4 +38,4 @@ curl_close($ch);
 ?>
 --EXPECTF--
 == Testing curl_error with a fake URL ==
-string(%d) "%sfakeURL%s"
+string(%d) "%sfakeURL%S"