Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Martin Jansen
dcd99c4b19
Add more tests for the new +0/-0 behaviour.
2012-12-29 03:31:22 +01:00
Martin Jansen
3990641e62
Treat "+0" and "-0" as valid integers just like var_dump() does.
...
This fixes bug #54096 .
2012-12-29 03:31:13 +01:00
Pierrick Charron
ac3d227e28
Fixed #63859 Memory leak when reusing curl-handle
...
When CURLOPT_POSTFIELDS is called more than once on the same
curl handle, php/curl did not free the memory of the previous
post data. This commit will fix the problem unless the curl
handle was previously duplicated using the curl_copy_handle()
function in which case we can not know if the post data is
still in use or not by any curl handle
2012-12-27 13:31:55 -05:00
Pierrick Charron
b10a3b9466
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed segfault due to libcurl connection caching
2012-12-22 19:04:45 -05:00
Pierrick Charron
a2b6d9c104
Fixed segfault due to libcurl connection caching
...
Libcurl is doing connection caching. When easy handle is cleaned up,
if the handle was previously used by the curl_multi_api, the connection
remains open un the curl multi handle is cleaned up. Some protocols are
sending content like the FTP one, and libcurl try to use the
WRITEFUNCTION or the HEADERFUNCTION. Since structures used in those
callback are freed, we need to use an other callback to which avoid
segfaults.
Libcurl commit d021f2e8a00 fix this issue and should be part of 7.28.2
2012-12-22 19:03:24 -05:00
Pierrick Charron
5499c7d201
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Conflicts:
ext/curl/interface.c
ext/curl/tests/bug63363.phpt
2012-12-21 19:24:28 -05:00
Pierrick Charron
af10e698a2
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
2012-12-21 19:12:43 -05:00
Pierrick Charron
517f800277
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
...
Fixed bug #63795
2012-12-21 19:10:55 -05:00
Pierrick Charron
59a4514dc0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test to work on every libcurl version
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
Conflicts:
tests/output/bug63377.phpt
2012-12-21 12:24:52 -05:00
Pierrick Charron
63659ce526
Fix test to work on every libcurl version
2012-12-21 12:19:54 -05:00
Pierrick Charron
763bce0303
Fix test
...
This test is only valid if libcurl < 7.28.1 since
libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
2012-12-21 11:45:59 -05:00
Pierrick Charron
66b88c92bb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #55438 (Curlwapper is not sending http header randomly)
2012-12-19 19:44:08 -05:00
Pierrick Charron
c46e1cdcae
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
2012-12-19 19:40:29 -05:00
Andrey Hristov
ae9ba081c8
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2012-12-19 15:08:09 +01:00
Remi Collet
3732fa95c5
fix failing test on Linux build
2012-12-19 10:23:57 +01:00
Andrey Hristov
1f7c46b579
be cautious about the result of strrchr
2012-12-18 16:21:05 +01:00
Xinchen Hui
05deaf1706
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72
dos2unix & skip on connect fail
2012-12-17 14:29:13 +08:00
Xinchen Hui
2f7f57a407
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 12:57:37 +08:00
Xinchen Hui
d2cc097049
Fix failed test
2012-12-17 12:56:55 +08:00
Rasmus Lerdorf
77c4b84ac8
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8
Need connect.inc here
2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
d845549257
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622
Fix broken test
...
Need to use the configured connection parameters here. We can't assume
the test user has access.
2012-12-13 16:41:56 -08:00
Rasmus Lerdorf
538d8338c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254
Fix broken test
...
This was missing a %s for the path here
2012-12-13 16:13:37 -08:00
Arpad Ray
6566ea6173
Fix #63379 - Don't reset mod_user_is_open in destroy
...
The parent handler is still open so the reset here was in error.
2012-12-13 23:51:43 +00:00
Anatoliy Belsky
0d458ae89f
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:01:01 +01:00
Xinchen Hui
1f516510b7
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2
MFH
2012-12-13 10:44:14 +08:00
Adam Harvey
2d1694d4eb
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
...
Fixes bug #63737 (json_decode does not properly decode with options parameter).
2012-12-11 19:51:30 +08:00
Dmitry Stogov
df97c3aa0d
Use get_gc instead of hacks of get_properties
2012-12-05 17:58:36 +04:00
Dmitry Stogov
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
Stanislav Malyshev
fd650ec93e
fix bug #63666 - Poor date() performance
2012-12-04 21:02:09 -08:00
Anatoliy Belsky
b8553d8494
Revert the previous test fix
...
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00
Anatoliy Belsky
89e547ce7f
Fix test with a slightly different warning in TS
2012-12-03 10:41:17 +01:00
Igor Wiedler
ec2a132f9c
Bug #49341 : Add SO_REUSEPORT support for socket_set_option()
...
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
2012-12-02 18:56:57 +01:00
Remi Collet
92a5e4def0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:24:02 +01:00
Remi Collet
c2554b4bb4
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
...
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'
Already known per bug45554 reproducer (also fixed).
2012-12-01 10:20:39 +01:00
Xinchen Hui
b689819567
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed
Fixed bug #63398 (Segfault when polling closed link)
2012-11-30 14:28:32 +08:00
Dmitry Stogov
7f7cff0bbb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
Conflicts:
NEWS
ext/soap/soap.c
2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:31:08 +04:00
Dmitry Stogov
1a09bf8023
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:38:18 +04:00
Anatoliy Belsky
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
Anatoliy Belsky
e0ad33c24a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
This test isn't supposed to pass on windows
2012-11-27 16:11:53 +01:00
Anatoliy Belsky
eff12e56b6
This test isn't supposed to pass on windows
2012-11-27 16:02:55 +01:00
Xinchen Hui
070239a194
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-27 13:36:38 +08:00