Pierrick Charron
a6a4323426
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix test
2012-12-21 11:50:50 -05:00
Pierrick Charron
9d235eadc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test
2012-12-21 11:49:00 -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
Nikita Popov
1f4c71b760
Merge branch 'PHP-5.5'
2012-12-21 17:34:14 +01:00
Nikita Popov
14f133036c
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.
2012-12-21 17:28:20 +01:00
Nikita Popov
4509016309
Merge branch 'PHP-5.5'
2012-12-21 01:58:29 +01:00
Nikita Popov
ffb848b275
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.
2012-12-21 01:56:37 +01:00
Nikita Popov
68730388ae
Merge branch 'PHP-5.5'
2012-12-20 20:36:06 +01:00
Nikita Popov
3e78c6ad25
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.
2012-12-20 20:33:18 +01:00
Rasmus Lerdorf
d417a054e1
Merge branch 'PHP-5.5'
2012-12-19 23:01:00 -05:00
Rasmus Lerdorf
d5fe89670e
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-19 23:00:41 -05:00
Rasmus Lerdorf
180b9e150b
Fix for bug #63811
2012-12-19 22:58:18 -05:00
Pierrick Charron
e33e143296
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #55438 (Curlwapper is not sending http header randomly)
2012-12-19 19:47:34 -05:00
Pierrick Charron
aa9156d7e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #55438 (Curlwapper is not sending http header randomly)
2012-12-19 19:46:57 -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
Johannes Schlüter
129580a81c
Merge branch 'PHP-5.5'
2012-12-19 17:02:12 +01:00
Johannes Schlüter
1ee8c3d9a2
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-19 17:01:44 +01:00
Andrey Hristov
456e37da12
Merge branch 'PHP-5.5'
2012-12-19 16:58:47 +01:00
Andrey Hristov
ec012c1b75
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 16:58:34 +01:00
Andrey Hristov
87f80928ba
Merge branch 'master' of ssh://git.php.net/php-src
2012-12-19 16:20:31 +01:00
Andrey Hristov
d57e474267
Merge branch 'PHP-5.4'
2012-12-19 16:20:19 +01:00
Johannes Schlüter
59692de77f
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-19 16:17:18 +01:00
Johannes Schlüter
e01fe5315c
Update release date
2012-12-19 16:15:39 +01:00
Nikita Popov
0e781e2309
Merge branch 'PHP-5.5'
2012-12-19 15:23:52 +01:00
Nikita Popov
2768315856
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.
2012-12-19 15:21:34 +01: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
Andrey Hristov
0a8777a515
Merge branch 'master' of ssh://git.php.net/php-src
2012-12-19 15:07:03 +01:00
Andrey Hristov
c780ddbb50
Merge branch 'PHP-5.4'
...
Conflicts:
ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 15:05:47 +01:00
Remi Collet
f98a03b144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix failing test on Linux build
2012-12-19 10:25:16 +01:00
Remi Collet
828bb4d44d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix failing test on Linux build
2012-12-19 10:25:05 +01:00
Remi Collet
3732fa95c5
fix failing test on Linux build
2012-12-19 10:23:57 +01:00
Nikita Popov
5f7c478d53
Merge branch 'PHP-5.5'
2012-12-18 21:41:55 +01:00
Nikita Popov
d53f1bf8ab
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.
2012-12-18 21:39:02 +01:00
David Soria Parra
2041e0dc18
Merge branch 'PHP-5.5'
...
* PHP-5.5:
News for PHP 5.5.0 Alphas
2012-12-18 17:28:22 +01:00
David Soria Parra
19f8bba10d
News for PHP 5.5.0 Alphas
2012-12-18 16:51:04 +01:00
Andrey Hristov
1f7c46b579
be cautious about the result of strrchr
2012-12-18 16:21:05 +01:00
Xinchen Hui
210d428f99
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)
2012-12-18 15:34:47 +08:00
Xinchen Hui
d3ec9ceb25
Revert "Fixed bug that exception won't be catched"
...
This reverts commit 28db07a0e3
.
Unexpected vm kind change
2012-12-18 15:27:54 +08:00
Xinchen Hui
28db07a0e3
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)
2012-12-18 15:20:58 +08:00
Xinchen Hui
73c9889663
Merge branch 'PHP-5.5'
2012-12-17 14:30:41 +08:00
Xinchen Hui
ea649a5aba
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-17 14:30:20 +08: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
6f452126ac
Merge branch 'PHP-5.5'
2012-12-17 12:58:38 +08:00
Xinchen Hui
ea5132866f
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-17 12:58:12 +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
Sebastian Bergmann
8e22b0408a
Merge branch 'PHP-5.5'
2012-12-16 09:08:01 +01:00
Sebastian Bergmann
67a7a66466
Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak
2012-12-16 09:07:55 +01:00