]> granicus.if.org Git - php/log
php
12 years agoNews entry for bug #52126
Lars Strojny [Sun, 6 Jan 2013 14:13:32 +0000 (15:13 +0100)]
News entry for bug #52126

12 years agoAdd unit test for mail.log ini setting.
Martin Jansen [Sun, 6 Jan 2013 07:59:10 +0000 (08:59 +0100)]
Add unit test for mail.log ini setting.

12 years agoAdd a timestamp to the mail log.
Martin Jansen [Mon, 24 Dec 2012 10:11:28 +0000 (11:11 +0100)]
Add a timestamp to the mail log.

This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Sun, 6 Jan 2013 13:54:40 +0000 (14:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoAdding test for bug #63462
Lars Strojny [Sun, 6 Jan 2013 13:46:49 +0000 (14:46 +0100)]
Adding test for bug #63462

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Sun, 6 Jan 2013 13:10:07 +0000 (14:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoCoding style, ANSI C compatibility
Lars Strojny [Sun, 6 Jan 2013 13:08:23 +0000 (14:08 +0100)]
Coding style, ANSI C compatibility

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Sun, 6 Jan 2013 02:23:51 +0000 (10:23 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 6 Jan 2013 02:23:21 +0000 (10:23 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoBug #23955: allow specifiy max age for setcookie()
Lars Strojny [Sun, 6 Jan 2013 02:22:44 +0000 (03:22 +0100)]
Bug #23955: allow specifiy max age for setcookie()

12 years agobump year
Xinchen Hui [Sun, 6 Jan 2013 02:22:15 +0000 (10:22 +0800)]
bump year

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 6 Jan 2013 02:20:10 +0000 (10:20 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Sun, 6 Jan 2013 02:20:00 +0000 (10:20 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agobump year
Xinchen Hui [Sun, 6 Jan 2013 02:19:09 +0000 (10:19 +0800)]
bump year

12 years agoAdding test from 5.5
Lars Strojny [Sun, 6 Jan 2013 02:15:08 +0000 (03:15 +0100)]
Adding test from 5.5

12 years agoBug #63699: performance improvements for varios ext/date functions
Lars Strojny [Sun, 6 Jan 2013 02:06:09 +0000 (03:06 +0100)]
Bug #63699: performance improvements for varios ext/date functions

12 years agoBug #63699 performance improvements for ext/date by only validating timezone when...
Lars Strojny [Sun, 6 Jan 2013 01:10:16 +0000 (02:10 +0100)]
Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set

12 years agoImprove resource management for curl handle
Pierrick Charron [Sat, 5 Jan 2013 16:07:59 +0000 (11:07 -0500)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 4 Jan 2013 03:05:53 +0000 (11:05 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoUpdate NEWS
Xinchen Hui [Fri, 4 Jan 2013 03:05:24 +0000 (11:05 +0800)]
Update NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 4 Jan 2013 03:03:52 +0000 (11:03 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63899 (Use after scope error in zend_compile)
Xinchen Hui [Fri, 4 Jan 2013 03:02:21 +0000 (11:02 +0800)]
Fixed bug #63899 (Use after scope error in zend_compile)

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Stanislav Malyshev [Fri, 4 Jan 2013 01:33:13 +0000 (17:33 -0800)]
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

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 4 Jan 2013 01:27:19 +0000 (17:27 -0800)]
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

12 years ago5.4.12-dev
Stanislav Malyshev [Fri, 4 Jan 2013 01:25:23 +0000 (17:25 -0800)]
5.4.12-dev

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 3 Jan 2013 22:00:17 +0000 (23:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 3 Jan 2013 21:59:38 +0000 (22:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoThis will be PHP 5.3.22
Johannes Schlüter [Thu, 3 Jan 2013 21:56:46 +0000 (22:56 +0100)]
This will be PHP 5.3.22

12 years agoremove set but not used variables
Remi Collet [Wed, 2 Jan 2013 15:48:46 +0000 (16:48 +0100)]
remove set but not used variables

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 2 Jan 2013 06:10:10 +0000 (22:10 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add bug #63762

12 years agoadd bug #63762
Stanislav Malyshev [Wed, 2 Jan 2013 06:09:32 +0000 (22:09 -0800)]
add bug #63762

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 2 Jan 2013 05:24:37 +0000 (21:24 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix #43177

12 years agoadd fix #43177
Stanislav Malyshev [Wed, 2 Jan 2013 05:24:11 +0000 (21:24 -0800)]
add fix #43177

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)]
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

12 years agoBug #43177: If an eval() has a parse error, the overall exit status and return code...
Stanislav Malyshev [Wed, 2 Jan 2013 04:14:44 +0000 (20:14 -0800)]
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.

12 years agofix NEWS
Stanislav Malyshev [Mon, 31 Dec 2012 01:58:40 +0000 (17:58 -0800)]
fix NEWS

12 years agoRemove passwd handler from struct when not needed
Pierrick Charron [Wed, 2 Jan 2013 02:12:02 +0000 (21:12 -0500)]
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

12 years agoHappy New Year
Xinchen Hui [Tue, 1 Jan 2013 08:37:09 +0000 (16:37 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 1 Jan 2013 08:31:06 +0000 (16:31 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoHappy New Year
Xinchen Hui [Tue, 1 Jan 2013 08:28:54 +0000 (16:28 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 1 Jan 2013 08:25:09 +0000 (16:25 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoHappy New Year
Xinchen Hui [Tue, 1 Jan 2013 08:23:31 +0000 (16:23 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 1 Jan 2013 08:07:55 +0000 (16:07 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoHappy New Year~
Xinchen Hui [Tue, 1 Jan 2013 08:02:16 +0000 (16:02 +0800)]
Happy New Year~

12 years agoFixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
Pierrick Charron [Sun, 30 Dec 2012 04:11:37 +0000 (23:11 -0500)]
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

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lars Strojny [Sat, 29 Dec 2012 02:36:06 +0000 (03:36 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoNews entry for +0/-0 filter fix
Lars Strojny [Sat, 29 Dec 2012 02:34:23 +0000 (03:34 +0100)]
News entry for +0/-0 filter fix

12 years agoAdd more tests for the new +0/-0 behaviour.
Martin Jansen [Wed, 26 Dec 2012 10:51:55 +0000 (11:51 +0100)]
Add more tests for the new +0/-0 behaviour.

12 years agoTreat "+0" and "-0" as valid integers just like var_dump() does.
Martin Jansen [Mon, 24 Dec 2012 13:58:01 +0000 (14:58 +0100)]
Treat "+0" and "-0" as valid integers just like var_dump() does.

This fixes bug #54096.

12 years agoAdd new curl options
Pierrick Charron [Fri, 28 Dec 2012 05:51:04 +0000 (00:51 -0500)]
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.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Thu, 27 Dec 2012 18:37:11 +0000 (13:37 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed #63859 Memory leak when reusing curl-handle

12 years agoFixed #63859 Memory leak when reusing curl-handle
Pierrick Charron [Thu, 27 Dec 2012 18:31:55 +0000 (13:31 -0500)]
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

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Wed, 26 Dec 2012 15:18:46 +0000 (10:18 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "Remove a useless memory write in zend_llist_del_element"

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Wed, 26 Dec 2012 15:17:37 +0000 (10:17 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoRevert "Remove a useless memory write in zend_llist_del_element"
Pierrick Charron [Wed, 26 Dec 2012 15:13:56 +0000 (10:13 -0500)]
Revert "Remove a useless memory write in zend_llist_del_element"

This reverts commit fad960a4045da86cdbd8308a165ffc47892f05b9 as
required by Stas and Christopher

12 years agoFix ext/curl tests to work on every libcurl versions
Pierrick Charron [Wed, 26 Dec 2012 05:43:37 +0000 (00:43 -0500)]
Fix ext/curl tests to work on every libcurl versions

Thanks Laruence :)

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Wed, 26 Dec 2012 01:59:20 +0000 (20:59 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove a useless memory write in zend_llist_del_element

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Wed, 26 Dec 2012 01:57:21 +0000 (20:57 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove a useless memory write in zend_llist_del_element

12 years agoRemove a useless memory write in zend_llist_del_element
Pierrick Charron [Wed, 26 Dec 2012 01:45:24 +0000 (20:45 -0500)]
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

12 years agospelling
Dmitry Stogov [Tue, 25 Dec 2012 12:23:52 +0000 (16:23 +0400)]
spelling

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 25 Dec 2012 12:22:07 +0000 (16:22 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  spelling

12 years agospelling
Dmitry Stogov [Tue, 25 Dec 2012 12:21:25 +0000 (16:21 +0400)]
spelling

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 25 Dec 2012 09:39:02 +0000 (13:39 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed ZTS build

12 years agoFixed ZTS build
Dmitry Stogov [Tue, 25 Dec 2012 09:38:14 +0000 (13:38 +0400)]
Fixed ZTS build

12 years agoRemoved deprecated fields
Dmitry Stogov [Tue, 25 Dec 2012 06:47:43 +0000 (10:47 +0400)]
Removed deprecated fields

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 25 Dec 2012 06:33:01 +0000 (10:33 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Traits refactoring

12 years agoTraits refactoring
Dmitry Stogov [Tue, 25 Dec 2012 06:23:08 +0000 (10:23 +0400)]
Traits refactoring

12 years agoImplement Generator::throw() method
Nikita Popov [Mon, 17 Dec 2012 21:02:32 +0000 (22:02 +0100)]
Implement Generator::throw() method

Generator::throw($exception) throws an exception into the generator. The
exception is thrown at the current point of suspension within the generator.
It basically behaves as if the current yield statement were replaced with
a throw statement and the generator subsequently resumed.

12 years agoUpdate NEWS
Pierrick Charron [Sun, 23 Dec 2012 22:48:05 +0000 (17:48 -0500)]
Update NEWS

12 years agoNew curl_pause() function
Pierrick Charron [Sun, 23 Dec 2012 22:13:49 +0000 (17:13 -0500)]
New curl_pause() function

Add the curl_pause function (binding of curl_easy_pause).
Using this function, you can explicitly mark a running connection
to get paused, and you can unpause a connection that was
previously paused.

12 years agoSupport for curl_strerror and curl_multi_strerror
Pierrick Charron [Sun, 23 Dec 2012 20:45:39 +0000 (15:45 -0500)]
Support for curl_strerror and curl_multi_strerror

Add the support for both curl_strerror and curl_multi_strerror.
Those function will return a string describing the error code
passed in the argument errornum

12 years agoAdd curl_multi_setopt and clean curl_share_setopt
Pierrick Charron [Sun, 23 Dec 2012 19:59:41 +0000 (14:59 -0500)]
Add curl_multi_setopt and clean curl_share_setopt

curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
and CURLMOPT_MAXCONNECTS

12 years agoRemove duplicated function definition
Pierrick Charron [Sun, 23 Dec 2012 19:05:04 +0000 (14:05 -0500)]
Remove duplicated function definition

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Sun, 23 Dec 2012 00:10:35 +0000 (19:10 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS file
  Fixed segfault due to libcurl connection caching

12 years agoUpdate NEWS file
Pierrick Charron [Sun, 23 Dec 2012 00:09:56 +0000 (19:09 -0500)]
Update NEWS file

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Sun, 23 Dec 2012 00:04:45 +0000 (19:04 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed segfault due to libcurl connection caching

12 years agoFixed segfault due to libcurl connection caching
Pierrick Charron [Sun, 23 Dec 2012 00:03:24 +0000 (19:03 -0500)]
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

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Sat, 22 Dec 2012 00:27:51 +0000 (19:27 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Sat, 22 Dec 2012 00:24:28 +0000 (19:24 -0500)]
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

12 years agoUpdate NEWS file
Pierrick Charron [Sat, 22 Dec 2012 00:19:25 +0000 (19:19 -0500)]
Update NEWS file

12 years agoFixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
Pierrick Charron [Sat, 22 Dec 2012 00:12:43 +0000 (19:12 -0500)]
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)

12 years agoCURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Pierrick Charron [Sat, 22 Dec 2012 00:10:55 +0000 (19:10 -0500)]
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)

Fixed bug #63795

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Fri, 21 Dec 2012 17:25:34 +0000 (12:25 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test to work on every libcurl version
  - Fixed typo on "SKIPIF" (causing make test to abort on some systems)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Fri, 21 Dec 2012 17:24:52 +0000 (12:24 -0500)]
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

12 years agoFix test to work on every libcurl version
Pierrick Charron [Fri, 21 Dec 2012 17:19:54 +0000 (12:19 -0500)]
Fix test to work on every libcurl version

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Fri, 21 Dec 2012 16:49:00 +0000 (11:49 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test

12 years agoFix test
Pierrick Charron [Fri, 21 Dec 2012 16:45:59 +0000 (11:45 -0500)]
Fix test

This test is only valid if libcurl < 7.28.1 since
libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.

12 years agoFix crash when last yielded value is a closure
Nikita Popov [Fri, 21 Dec 2012 16:28:20 +0000 (17:28 +0100)]
Fix crash when last yielded value is a closure

If zend_generator_close is called from within zend_generator_resume (e.g.
due to a return statement) then all the EGs will still be using the values
from the generator. That's why the stack frame has to be the last thing
that is dtored, otherwise some other dtor that is using
EG(current_execute_data) might access the already freed memory segment.
This was the case with the closure dtor.

The fix is to move the dtors for key and value to the start of the handler.
This way the stack frame is the last thing that is freed.

12 years agoFix bug #63822: Crash when using closures with ArrayAccess
Nikita Popov [Fri, 21 Dec 2012 00:56:37 +0000 (01:56 +0100)]
Fix bug #63822: Crash when using closures with ArrayAccess

op_array->T was used after the closure's op_array was already freed. This just
swaps the freeing order.

12 years ago- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
Felipe Pena [Fri, 21 Dec 2012 00:35:05 +0000 (22:35 -0200)]
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)

12 years agoDo not add a ref to EX(object) on generator clone
Nikita Popov [Thu, 20 Dec 2012 19:33:18 +0000 (20:33 +0100)]
Do not add a ref to EX(object) on generator clone

If a ref has to be added it will be already added while walking the call
slots.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Rasmus Lerdorf [Thu, 20 Dec 2012 04:00:41 +0000 (23:00 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoFix for bug #63811
Rasmus Lerdorf [Thu, 20 Dec 2012 03:58:18 +0000 (22:58 -0500)]
Fix for bug #63811

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Thu, 20 Dec 2012 00:46:57 +0000 (19:46 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Thu, 20 Dec 2012 00:44:08 +0000 (19:44 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)

12 years agoFixed bug #55438 (Curlwapper is not sending http header randomly)
Pierrick Charron [Thu, 20 Dec 2012 00:40:29 +0000 (19:40 -0500)]
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

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 19 Dec 2012 16:01:44 +0000 (17:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 19 Dec 2012 15:58:34 +0000 (16:58 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/mysqlnd/mysqlnd_alloc.c

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 19 Dec 2012 15:17:18 +0000 (16:17 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoUpdate release date
Johannes Schlüter [Wed, 19 Dec 2012 15:15:39 +0000 (16:15 +0100)]
Update release date