php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
72,677 Commits 549 Branches 1,486 Tags
6da86acfaeba96ec16473f50a6b86d8e40eda5e0
Commit Graph

72677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev 6da86acfae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS
 2013-01-01 21:21:42 -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 a63a725301 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove passwd handler from struct when not needed
 2013-01-01 21:18:08 -05: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 642721b38a Merge branch 'PHP-5.5' 2013-01-01 16:39:03 +08: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 ae5d86270f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
 2012-12-29 23:16:53 -05: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 3b022e57ed Merge branch 'PHP-5.5' 2012-12-29 03:38:23 +01: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 90cbe2a01f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add new curl options
 2012-12-28 00:53:03 -05: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 f3ff33a2b5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed #63859 Memory leak when reusing curl-handle
 2012-12-27 13:39:58 -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 c9a080d09f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "Remove a useless memory write in zend_llist_del_element"
 2012-12-26 10:19:04 -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 407f851732 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix ext/curl tests to work on every libcurl versions
 2012-12-26 00:44:25 -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 d87ad19683 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove a useless memory write in zend_llist_del_element
 2012-12-25 20:59:38 -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 ba6317b05e Merge branch 'PHP-5.5' 
* PHP-5.5:
  spelling
 2012-12-25 16:24:09 +04:00
Dmitry Stogov 8e6bf9e5e5 spelling 2012-12-25 16:23:52 +04:00
Dmitry Stogov 245dbb043e Merge branch 'PHP-5.5' 
* PHP-5.5:
  spelling
 2012-12-25 16:22:22 +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
Dmitry Stogov 8728ca65c6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed ZTS build
 2012-12-25 13:39:13 +04:00
Dmitry Stogov 016f3c8610 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed ZTS build
 2012-12-25 13:39:02 +04:00
Dmitry Stogov f0b459b7c4 Fixed ZTS build 2012-12-25 13:38:14 +04:00
Dmitry Stogov f3ea497377 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Removed deprecated fields
 2012-12-25 10:50:35 +04:00
Dmitry Stogov bc0425c025 Removed deprecated fields 2012-12-25 10:47:43 +04:00
Dmitry Stogov 3b17a09017 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Traits refactoring
 2012-12-25 10:34:07 +04:00
Dmitry Stogov b8c719c068 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Traits refactoring
 2012-12-25 10:33:01 +04:00
Dmitry Stogov 3f8c729e69 Traits refactoring 2012-12-25 10:23:08 +04:00
Nikita Popov fd25d48494 Merge branch 'PHP-5.5' 2012-12-24 00:30:26 +01:00