diff options
author | Michael Wallner <mike@php.net> | 2014-04-30 13:02:43 +0200 |
---|---|---|
committer | Michael Wallner <mike@php.net> | 2014-04-30 13:02:43 +0200 |
commit | 42fbb952d77a53ce8995061b64e5f7c4bcef94af (patch) | |
tree | 8b2458573f1efd83b0641cf2c0f1b01150a35b26 | |
parent | aaad7ead55c33688156ad1cd85412041eadf0628 (diff) | |
parent | b79301d11f0fafe34a54cfc117fbe6bd00f52032 (diff) | |
download | php-git-42fbb952d77a53ce8995061b64e5f7c4bcef94af.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test locality inconsitency
-rw-r--r-- | ext/curl/tests/bug64267.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/tests/bug64267.phpt b/ext/curl/tests/bug64267.phpt index 3165b52f74..1b115588ff 100644 --- a/ext/curl/tests/bug64267.phpt +++ b/ext/curl/tests/bug64267.phpt @@ -27,9 +27,9 @@ curl_exec($c); var_dump(curl_getinfo($c, CURLINFO_RESPONSE_CODE)); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- TEST bool(true) bool(true) -int(302) +int(30%d) ===DONE=== |