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
Lars Strojny
f3824ad166
Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set
2013-01-06 02:10:16 +01:00
Pierrick Charron
f85e5950ab
Improve resource management for curl handle
...
Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.
2013-01-05 11:07:59 -05:00
Xinchen Hui
c4f2a20f15
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-04 11:05:53 +08:00
Xinchen Hui
2feea39a33
Update NEWS
2013-01-04 11:05:24 +08:00
Xinchen Hui
aff5d084a5
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227
Fixed bug #63899 (Use after scope error in zend_compile)
2013-01-04 11:02:21 +08:00
Stanislav Malyshev
1dda0c55d5
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
remove set but not used variables
2013-01-03 17:33:13 -08:00
Stanislav Malyshev
a72102f267
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.12-dev
This will be PHP 5.3.22
Conflicts:
configure.in
main/php_version.h
2013-01-03 17:27:19 -08:00
Stanislav Malyshev
5894aa0950
5.4.12-dev
2013-01-03 17:25:56 -08:00
Johannes Schlüter
c2ad8926e7
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-03 23:00:17 +01:00
Johannes Schlüter
aaecb99c6b
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2013-01-03 22:59:38 +01:00
Johannes Schlüter
712710bfec
This will be PHP 5.3.22
2013-01-03 22:56:46 +01:00
Remi Collet
b3a8609837
remove set but not used variables
2013-01-02 16:48:46 +01:00
Stanislav Malyshev
ff6b9a4b68
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add bug #63762
2013-01-01 22:10:10 -08:00
Stanislav Malyshev
7ed2fdbf99
add bug #63762
2013-01-01 22:09:32 -08:00
Stanislav Malyshev
39df129161
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add fix #43177
2013-01-01 21:24:37 -08:00
Stanislav Malyshev
86c46b96b6
add fix #43177
2013-01-01 21:24:11 -08:00
Stanislav Malyshev
80a9a80a52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
Conflicts:
main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
...
Without this fix, a webpage using eval() may return code 500. That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Stanislav Malyshev
dd288f93e1
fix NEWS
2013-01-01 19:05:25 -08:00
Pierrick Charron
343a9199bb
Remove passwd handler from struct when not needed
...
CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one
2013-01-01 21:12:02 -05:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
f01c295dc6
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-01 16:31:06 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
58dabff8ed
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-01 16:25:09 +08:00
Xinchen Hui
831fbcf385
Happy New Year
2013-01-01 16:23:31 +08:00
Xinchen Hui
38150cbd7a
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-01 16:07:55 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Pierrick Charron
8228597ecc
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
...
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
2012-12-29 23:11:37 -05:00
Lars Strojny
f8a9a47e8c
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-29 03:36:06 +01:00
Lars Strojny
ee258fe87d
News entry for +0/-0 filter fix
2012-12-29 03:34:23 +01: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
722b8fb80e
Add new curl options
...
Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION,
CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE,
CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.
2012-12-28 00:51:04 -05:00
Pierrick Charron
8b67981b67
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #63859 Memory leak when reusing curl-handle
2012-12-27 13:37:11 -05: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
61afb2bb8f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "Remove a useless memory write in zend_llist_del_element"
2012-12-26 10:18:46 -05:00
Pierrick Charron
663434cd76
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-26 10:17:37 -05:00
Pierrick Charron
b35ffdeae1
Revert "Remove a useless memory write in zend_llist_del_element"
...
This reverts commit fad960a404
as
required by Stas and Christopher
2012-12-26 10:13:56 -05:00
Pierrick Charron
8456cef1db
Fix ext/curl tests to work on every libcurl versions
...
Thanks Laruence :)
2012-12-26 00:43:37 -05:00
Pierrick Charron
5a97c30efe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:20 -05:00
Pierrick Charron
c12ab5c306
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:57:21 -05:00
Pierrick Charron
fad960a404
Remove a useless memory write in zend_llist_del_element
...
The zend_llist_element *next pointer is not necessary and removing
it will also remove a write on memory
2012-12-25 20:45:24 -05:00
Dmitry Stogov
8e6bf9e5e5
spelling
2012-12-25 16:23:52 +04:00
Dmitry Stogov
7625a3b3b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
spelling
2012-12-25 16:22:07 +04:00
Dmitry Stogov
7e2629635b
spelling
2012-12-25 16:21:25 +04:00