]> granicus.if.org Git - php/log
php
12 years agoMerge branch 'PHP-5.5'
Pierrick Charron [Sun, 30 Dec 2012 04:16:53 +0000 (23:16 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

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.5'
Lars Strojny [Sat, 29 Dec 2012 02:38:23 +0000 (03:38 +0100)]
Merge branch 'PHP-5.5'

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 agoMerge branch 'PHP-5.5'
Pierrick Charron [Fri, 28 Dec 2012 05:53:03 +0000 (00:53 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add new curl options

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.5'
Pierrick Charron [Thu, 27 Dec 2012 18:39:58 +0000 (13:39 -0500)]
Merge branch 'PHP-5.5'

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

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.5'
Pierrick Charron [Wed, 26 Dec 2012 15:19:04 +0000 (10:19 -0500)]
Merge branch 'PHP-5.5'

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

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 agoMerge branch 'PHP-5.5'
Pierrick Charron [Wed, 26 Dec 2012 05:44:25 +0000 (00:44 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix ext/curl tests to work on every libcurl versions

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.5'
Pierrick Charron [Wed, 26 Dec 2012 01:59:38 +0000 (20:59 -0500)]
Merge branch 'PHP-5.5'

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

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 25 Dec 2012 12:24:09 +0000 (16:24 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  spelling

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

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

* PHP-5.5:
  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.5'
Dmitry Stogov [Tue, 25 Dec 2012 09:39:13 +0000 (13:39 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed ZTS build

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 agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 25 Dec 2012 06:50:35 +0000 (10:50 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Removed deprecated fields

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.5'
Dmitry Stogov [Tue, 25 Dec 2012 06:34:07 +0000 (10:34 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Traits refactoring

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 agoMerge branch 'PHP-5.5'
Nikita Popov [Sun, 23 Dec 2012 23:30:26 +0000 (00:30 +0100)]
Merge branch 'PHP-5.5'

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 agoMerge branch 'PHP-5.5'
Pierrick Charron [Sun, 23 Dec 2012 22:51:43 +0000 (17:51 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Update NEWS
  New curl_pause() function
  Support for curl_strerror and curl_multi_strerror
  Add curl_multi_setopt and clean curl_share_setopt
  Remove duplicated function definition

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.5'
Pierrick Charron [Sun, 23 Dec 2012 00:12:27 +0000 (19:12 -0500)]
Merge branch 'PHP-5.5'

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

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.5'
Pierrick Charron [Sat, 22 Dec 2012 00:29:14 +0000 (19:29 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  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.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.5'
Pierrick Charron [Fri, 21 Dec 2012 17:26:03 +0000 (12:26 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  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.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.5'
Pierrick Charron [Fri, 21 Dec 2012 16:50:50 +0000 (11:50 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix test

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 agoMerge branch 'PHP-5.5'
Nikita Popov [Fri, 21 Dec 2012 16:34:14 +0000 (17:34 +0100)]
Merge branch 'PHP-5.5'

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 agoMerge branch 'PHP-5.5'
Nikita Popov [Fri, 21 Dec 2012 00:58:29 +0000 (01:58 +0100)]
Merge branch 'PHP-5.5'

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 agoMerge branch 'PHP-5.5'
Nikita Popov [Thu, 20 Dec 2012 19:36:06 +0000 (20:36 +0100)]
Merge branch 'PHP-5.5'

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.5'
Rasmus Lerdorf [Thu, 20 Dec 2012 04:01:00 +0000 (23:01 -0500)]
Merge branch 'PHP-5.5'

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.5'
Pierrick Charron [Thu, 20 Dec 2012 00:47:34 +0000 (19:47 -0500)]
Merge branch 'PHP-5.5'

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

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.5'
Johannes Schlüter [Wed, 19 Dec 2012 16:02:12 +0000 (17:02 +0100)]
Merge branch 'PHP-5.5'

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.5'
Andrey Hristov [Wed, 19 Dec 2012 15:58:47 +0000 (16:58 +0100)]
Merge branch '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 'master' of ssh://git.php.net/php-src
Andrey Hristov [Wed, 19 Dec 2012 15:20:31 +0000 (16:20 +0100)]
Merge branch 'master' of ssh://git.php.net/php-src

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

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

12 years agoMerge branch 'PHP-5.5'
Nikita Popov [Wed, 19 Dec 2012 14:23:52 +0000 (15:23 +0100)]
Merge branch 'PHP-5.5'

12 years agoAdd missing zend_do_free call
Nikita Popov [Wed, 19 Dec 2012 14:21:34 +0000 (15:21 +0100)]
Add missing zend_do_free call

This is a followup to d53f1bf8ab. When the yield *statement* is used its
return value still needs to be freed.

12 years agoMerge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Andrey Hristov [Wed, 19 Dec 2012 14:08:09 +0000 (15:08 +0100)]
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

12 years agoMerge branch 'master' of ssh://git.php.net/php-src
Andrey Hristov [Wed, 19 Dec 2012 14:07:03 +0000 (15:07 +0100)]
Merge branch 'master' of ssh://git.php.net/php-src

12 years agoMerge branch 'PHP-5.4'
Andrey Hristov [Wed, 19 Dec 2012 14:05:47 +0000 (15:05 +0100)]
Merge branch 'PHP-5.4'

Conflicts:
ext/mysqlnd/mysqlnd_alloc.c

12 years agoMerge branch 'PHP-5.5'
Remi Collet [Wed, 19 Dec 2012 09:25:16 +0000 (10:25 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix failing test on Linux build

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Wed, 19 Dec 2012 09:25:05 +0000 (10:25 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix failing test on Linux build

12 years agofix failing test on Linux build
Remi Collet [Wed, 19 Dec 2012 09:23:57 +0000 (10:23 +0100)]
fix failing test on Linux build

12 years agoMerge branch 'PHP-5.5'
Nikita Popov [Tue, 18 Dec 2012 20:41:55 +0000 (21:41 +0100)]
Merge branch 'PHP-5.5'

12 years agoFix leak when generator ignores sent value
Nikita Popov [Tue, 18 Dec 2012 20:36:48 +0000 (21:36 +0100)]
Fix leak when generator ignores sent value

When the return value of yield wasn't used it was leaked.

This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are
automatically freed when they aren't used.

12 years agoMerge branch 'PHP-5.5'
David Soria Parra [Tue, 18 Dec 2012 16:28:22 +0000 (17:28 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  News for PHP 5.5.0 Alphas

12 years agoNews for PHP 5.5.0 Alphas
David Soria Parra [Fri, 14 Dec 2012 23:08:39 +0000 (00:08 +0100)]
News for PHP 5.5.0 Alphas

12 years agobe cautious about the result of strrchr
Andrey Hristov [Tue, 18 Dec 2012 15:21:05 +0000 (16:21 +0100)]
be cautious about the result of strrchr

12 years agoixed bug that exception won't be catched
Xinchen Hui [Tue, 18 Dec 2012 07:34:47 +0000 (15:34 +0800)]
ixed bug that exception won't be catched

Related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)

12 years agoRevert "Fixed bug that exception won't be catched"
Xinchen Hui [Tue, 18 Dec 2012 07:27:54 +0000 (15:27 +0800)]
Revert "Fixed bug that exception won't be catched"

This reverts commit 28db07a0e39ee593edc843ce3c162da247eb2bbe.

Unexpected vm kind change

12 years agoFixed bug that exception won't be catched
Xinchen Hui [Tue, 18 Dec 2012 07:20:58 +0000 (15:20 +0800)]
Fixed bug that exception won't be catched

related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)

12 years agoMerge branch 'PHP-5.5'
Xinchen Hui [Mon, 17 Dec 2012 06:30:41 +0000 (14:30 +0800)]
Merge branch 'PHP-5.5'