Xinchen Hui
3bc7490370
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-15 15:32:42 +08:00
Xinchen Hui
4fcf4e0845
Fixed bug #57702 (Multi-row BLOB fetches)
2013-01-15 15:31:49 +08:00
Adam Harvey
a4191b0aad
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update fputcsv() to escape all characters equally.
2013-01-15 15:24:21 +08:00
Adam Harvey
9b5cb0e805
Update fputcsv() to escape all characters equally.
...
At present, backslashes have special case handling within fputcsv(): when one
is encountered within a field that's being escaped, escaping stops until the
next instance of the enclosure character is hit. This can result in malformed
CSV.
Fixes bug #43225 (fputcsv incorrectly handles cells ending in \ followed by ").
2013-01-15 15:17:45 +08:00
Lars Strojny
6a065876b9
Bug #52958 : Segfault in PDO_OCI on cleanup after running a long testsuite.
2013-01-14 21:35:48 +01:00
Lars Strojny
bf9ad4e661
Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29
2013-01-14 18:52:38 +01:00
Lars Strojny
1e9a3ed234
Fix bug #63916 : PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite
2013-01-14 17:59:11 +01:00
Lars Strojny
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
ULF WENDEL
36e88d78e6
MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:51:14 +01:00
Remi Collet
f659ec108f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
...
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
Andrey Hristov
d430b5a4eb
Add mysqli support - constants and checking in mysqli_options() for the
...
new constant for password expriration
2013-01-09 19:14:48 +01:00
Andrey Hristov
258c76eb41
backport handling of expired passwords in mysqlnd to 5.4
2013-01-09 18:58:29 +01:00
Andrey Hristov
bcd278ad7f
fix compilation error after merge
2013-01-09 18:39:59 +01:00
Andrey Hristov
6a6ec195ac
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 18:27:50 +01:00
Andrey Hristov
12e759c2ea
Use during connect the flags set with set_client_option()
2013-01-09 18:27:06 +01:00
Xinchen Hui
15aaa9c660
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 10:54:23 +08:00
Xinchen Hui
c05ee74e7f
Fixed bug #63943 (Bad warning text from strpos() on empty needle)
2013-01-09 10:53:20 +08:00
Derick Rethans
ba35ae32b7
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 15:07:13 +00:00
Derick Rethans
ff9c1b12ff
Fixed bug #55397 : Comparsion of incomplete DateTime causes SIGSEGV.
2013-01-06 13:39:34 +00:00
Lars Strojny
d7da1aa694
Coding style, ANSI C compatibility
2013-01-06 14:08:23 +01:00
Xinchen Hui
a426e0b050
bump year
2013-01-06 10:22:15 +08:00
Xinchen Hui
a3a699e090
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-01-06 10:20:10 +08:00
Xinchen Hui
c2f8e90504
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-06 10:20:00 +08:00
Xinchen Hui
bc11e6fdbb
bump year
2013-01-06 10:19:09 +08:00
Lars Strojny
8e5460ad86
Adding test from 5.5
2013-01-06 03:15:08 +01:00
Lars Strojny
67557fcfce
Bug #63699 : performance improvements for varios ext/date functions
2013-01-06 03:06:09 +01:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +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