Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix for Bug #63916 #252

Closed
wants to merge 10,000 commits into from
@srgoogleguy

This fixes Bug #63916 in a more reasonable way. The changes are compile time macros and I don't see a huge BC concern since I doubt anyone would rely on the old broken behavior. As such I'm sending a PR to PHP-5.3 so it can be merged with 5.4 later going forward.

weltling and others added some commits
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Two tests deactivated until #63688 was fixed
7d7ff76
@weltling weltling Merge branch 'PHP-5.5'
* PHP-5.5:
  Two tests deactivated until #63688 was fixed
9e50c54
@dstogov dstogov Slight performance improvement fa30e47
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Slight performance improvement
77a9b9a
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed
4facafd
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed
26c165c
@dstogov dstogov Fixed comments 27528b6
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed comments
55e1a97
@dstogov dstogov Fixed bug #63680 (Memleak in splfixedarray with cycle reference) 881416c
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

Conflicts:
	NEWS
274ceb3
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
73601e2
@dstogov dstogov Use get_gc instead of hacks of get_properties df97c3a
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Use get_gc instead of hacks of get_properties
bc78571
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Use get_gc instead of hacks of get_properties
5ae182e
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	configure.in
	main/php_version.h
811cd76
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 cd6bf83
@johannes johannes Merge branch 'PHP-5.5' c058ed5
@sgolemon sgolemon Add UConverter class (ICU's UConverter API) 5ac3577
Sebastian Bergmann Invoke re2c with --no-generation-date to prevent unintentional / unne…
…cessary changes in generated files.
eab1499
Sebastian Bergmann Merge branch 'PHP-5.5' 6fc2eca
Sebastian Bergmann Leftover: Invoke re2c with --no-generation-date to prevent unintentio…
…nal / unnecessary changes in generated files.
8ca4288
Sebastian Bergmann Merge branch 'PHP-5.5' 4f4262e
@dstogov dstogov Generatirs are going to be used less than regular functions e3b2a5c
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Generatirs are going to be used less than regular functions
3067f54
Sebastian Bergmann Cleanup NEWS 16ec6fa
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 2a75f59
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 4e7db3e
@laruence laruence Merge branch 'PHP-5.5' 107093e
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 a1e401f
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 8b8fb64
@laruence laruence Fixed bug #63726 (Memleak with static properties and internal/user cl…
…asses)

No test scripts provided (will try to find one)
3d86e6d
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 70b65f3
@laruence laruence Merge branch 'PHP-5.5' 80e5850
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4 bd36d49
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 1aba460
@johannes johannes Merge branch 'PHP-5.5' ab2bfb6
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4 95fd52f
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 c007ba4
@johannes johannes Merge branch 'PHP-5.5' ef7ab81
@LawnGnome LawnGnome Deprecate ext/mysql.
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
b7091aa
@LawnGnome LawnGnome Merge branch 'PHP-5.5'
* PHP-5.5:
  Deprecate ext/mysql.
ac0fb01
@LawnGnome LawnGnome Tinker with the wording of the MySQL deprecation news post.
I know that in general NEWS is a very punchy "this is what happened" log, but
Chris e-mailed me off-list to ask if it could be added to avoid any FUD — this
merely brings the NEWS post into line with UPGRADING, the migration guide, and
every other piece of advice we're giving out.

I also forgot to add the RFC URL last night, so added that.
ec83534
@LawnGnome LawnGnome Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare …
…numbers.

Fixes bug #63737 (json_decode does not properly decode with options parameter).
2d1694d
@LawnGnome LawnGnome Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
8bb106d
@LawnGnome LawnGnome Merge branch 'PHP-5.5' b10460d
@dstogov dstogov - generators API exported for extensions
- improved RETURN sequence to avoid redundant check if op_array is a generator
a9a5f7a
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  - generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2025021
@remicollet remicollet Fixed Bug #63738 unpack: back result with Z format
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
4d8d5d8
@remicollet remicollet Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63738 unpack: back result with Z format
261995e
@lt lt Fixed license
Looks like a find and replace gone wrong.
349baa3
@dstogov dstogov Restored proper generators behaviour in conjunction with "finally". (…
…Nikita)
9c96fe5
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Restored proper generators behaviour in conjunction with "finally". (Nikita)
e7364e1
@remicollet remicollet Really fix test pdo_mysql_class_constants.phpt
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
	skip the test if no connection
	use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
6e4cfa1
@remicollet remicollet Merge branch 'PHP-5.5'
* PHP-5.5:
  Really fix test pdo_mysql_class_constants.phpt
1f73ce3
@dstogov dstogov An exception thrown in try or catch block is disacarded by return sta…
…tement in finally block.
6b0b4bf
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  An exception thrown in try or catch block is disacarded by return statement in finally block.
7b84d12
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
0450cb7
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
6fd8b65
@laruence laruence Merge branch 'license_fix' of https://github.com/leight/php-src 3516b98
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 1f51651
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 4d2593e
@laruence laruence Merge branch 'PHP-5.5' 7ed8593
@dstogov dstogov Fixed bug #63757 (getenv() produces memory leak with CGI SAPI) 35f86d2
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
4b1b115
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
20113b5
@dstogov dstogov Removed redundand checks from release build ff1e1d7
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed redundand checks from release build
cc118f7
@dstogov dstogov Removed unnecessary checks 438cd86
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed unnecessary checks
7dd16bc
@dstogov dstogov Removed unreachable code d5c2da5
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed unreachable code
432902a
@weltling weltling Fixed mysqlnd compilation in debug mode on windows 0d458ae
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed mysqlnd compilation in debug mode on windows
bef54e5
@weltling weltling Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed mysqlnd compilation in debug mode on windows
54a04d2
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4 ef37055
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 2098cc7
@johannes johannes Merge branch 'PHP-5.5' f8a2407
@arraypad arraypad Fix #63379 - Don't reset mod_user_is_open in destroy
The parent handler is still open so the reset here was in error.
6566ea6
@arraypad arraypad Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix #63379 - Don't reset mod_user_is_open in destroy
61bf1f4
@arraypad arraypad Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #63379 - Don't reset mod_user_is_open in destroy
c66e54d
@rlerdorf rlerdorf Merge branch 'PHP-5.3' into PHP-5.4 538d833
@rlerdorf rlerdorf Merge branch 'PHP-5.4' 8fbeb6e
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5 17b803d
@rlerdorf rlerdorf Merge branch 'PHP-5.3' into PHP-5.4 d845549
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5 3925683
@rlerdorf rlerdorf Merge branch 'PHP-5.5' c701aeb
@rlerdorf rlerdorf Merge branch 'PHP-5.3' into PHP-5.4 77c4b84
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5 5aabf24
@rlerdorf rlerdorf Merge branch 'PHP-5.5' 42f3344
@dstogov dstogov Fixed uninitialized EX(call)->called_scope e65b966
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed uninitialized EX(call)->called_scope
ec4ff07
@laruence laruence Add test for bug #63741 a467809
@laruence laruence Add test for bug #63741 359d91a
@laruence laruence Merge branch 'PHP-5.5' 1062052
@laruence laruence Fixed warning of no return in non-void funciton 9fb5cfd
@laruence laruence Merge branch 'PHP-5.5' 3acc729
@laruence laruence Fix warning of no return in non-void function a73a6be
@laruence laruence Merge branch 'PHP-5.5' 72f7543
@smalyshev

Which compiler do you use? I've never seen warnings there, and zend_error_noreturn exists precisely for that reason.

pascalchevrel and others added some commits
@pascalchevrel pascalchevrel update list of common Mime Types in PHP development server to support…
… Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
e5b1ebc
@pascalchevrel pascalchevrel update test for supported Mime Types checking d813af0
@lstrojny lstrojny News entry for updated mime types c3b4803
@lstrojny lstrojny Merge branch 'PHP-5.4' into PHP-5.5 aaa5e42
@lstrojny lstrojny Merge branch 'master' of git://github.com/php/php-src 765d520
@lstrojny lstrojny Merge branch 'PHP-5.5' eb0693a
@lstrojny lstrojny Updating news entry to list new filetypes 36a5eca
@remicollet remicollet Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 717b367
@remicollet remicollet Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 4ef9f00
Sebastian Bergmann Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbak 67a7a66
Sebastian Bergmann Merge branch 'PHP-5.5' 8e22b04
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 2f7f57a
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 ea51328
@laruence laruence Merge branch 'PHP-5.5' 6f45212
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 05deaf1
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 ea649a5
@laruence laruence Merge branch 'PHP-5.5' 73c9889
@laruence laruence 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)
28db07a
@laruence laruence Revert "Fixed bug that exception won't be catched"
This reverts commit 28db07a.

Unexpected vm kind change
d3ec9ce
@laruence laruence 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)
210d428
Andrey Hristov be cautious about the result of strrchr 1f7c46b
@dsp dsp News for PHP 5.5.0 Alphas 19f8bba
@dsp dsp Merge branch 'PHP-5.5'
* PHP-5.5:
  News for PHP 5.5.0 Alphas
2041e0d
@nikic nikic 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.
d53f1bf
@nikic nikic Merge branch 'PHP-5.5' 5f7c478
@remicollet remicollet fix failing test on Linux build 3732fa9
@remicollet remicollet Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix failing test on Linux build
828bb4d
@remicollet remicollet Merge branch 'PHP-5.5'
* PHP-5.5:
  fix failing test on Linux build
f98a03b
Andrey Hristov Merge branch 'PHP-5.4'
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
c780ddb
Andrey Hristov Merge branch 'master' of ssh://git.php.net/php-src 0a8777a
Andrey Hristov Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 ae9ba08
@nikic nikic Add missing zend_do_free call
This is a followup to d53f1bf. When the yield *statement* is used its
return value still needs to be freed.
2768315
@nikic nikic Merge branch 'PHP-5.5' 0e781e2
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4 59692de
Andrey Hristov Merge branch 'PHP-5.4' d57e474
Andrey Hristov Merge branch 'master' of ssh://git.php.net/php-src 87f8092
Andrey Hristov Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
ec012c1
Andrey Hristov Merge branch 'PHP-5.5' 456e37d
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 1ee8c3d
@johannes johannes Merge branch 'PHP-5.5' 129580a
@adoy adoy Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
66b88c9
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
aa9156d
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
e33e143
@rlerdorf rlerdorf Fix for bug #63811 180b9e1
@rlerdorf rlerdorf Merge branch 'PHP-5.4' into PHP-5.5 d5fe896
@rlerdorf rlerdorf Merge branch 'PHP-5.5' d417a05
@nikic nikic 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.
3e78c6a
@nikic nikic Merge branch 'PHP-5.5' 6873038
@nikic nikic 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.
ffb848b
@nikic nikic Merge branch 'PHP-5.5' 4509016
@nikic nikic 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.
14f1330
@nikic nikic Merge branch 'PHP-5.5' 1f4c71b
@adoy adoy Fix test
This test is only valid if libcurl < 7.28.1 since
libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
763bce0
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix test
9d235ea
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test
a6a4323
@adoy adoy 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
59a4514
@adoy adoy 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)
52e7b0c
@adoy adoy 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)
9cf98be
@adoy adoy 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
5499c7d
@adoy adoy 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)
e3c88d1
@adoy adoy 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)
657d3f1
@adoy adoy Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed segfault due to libcurl connection caching
b10a3b9
@adoy adoy Update NEWS file 3f0dcc0
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update NEWS file
  Fixed segfault due to libcurl connection caching
ee45354
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS file
  Fixed segfault due to libcurl connection caching
6ec8136
@adoy adoy Remove duplicated function definition ded889e
@adoy adoy Add curl_multi_setopt and clean curl_share_setopt
curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
and CURLMOPT_MAXCONNECTS
64595a5
@adoy adoy 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
4b4f3db
@adoy adoy 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.
33f44af
@adoy adoy Update NEWS 24f1ef1
@adoy adoy 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
c5cfe37
@nikic nikic 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.
be7b0bc
@nikic nikic Merge branch 'PHP-5.5' fd25d48
@dstogov dstogov Traits refactoring 3f8c729
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Traits refactoring
b8c719c
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Traits refactoring
3b17a09
@dstogov dstogov Removed deprecated fields bc0425c
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed deprecated fields
f3ea497
@dstogov dstogov Fixed ZTS build f0b459b
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed ZTS build
016f3c8
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ZTS build
8728ca6
@dstogov dstogov spelling 7e26296
@dstogov dstogov Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  spelling
7625a3b
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  spelling
245dbb0
@dstogov dstogov spelling 8e6bf9e
@dstogov dstogov Merge branch 'PHP-5.5'
* PHP-5.5:
  spelling
ba6317b
@adoy adoy Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Remove a useless memory write in zend_llist_del_element
c12ab5c
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove a useless memory write in zend_llist_del_element
5a97c30
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove a useless memory write in zend_llist_del_element
d87ad19
@adoy adoy Fix ext/curl tests to work on every libcurl versions
Thanks Laruence :)
8456cef
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix ext/curl tests to work on every libcurl versions
407f851
@adoy adoy Merge branch 'PHP-5.3' into PHP-5.4 663434c
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert "Remove a useless memory write in zend_llist_del_element"
61afb2b
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Remove a useless memory write in zend_llist_del_element"
c9a080d
@adoy adoy 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
ac3d227
@adoy adoy Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed #63859 Memory leak when reusing curl-handle
8b67981
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed #63859 Memory leak when reusing curl-handle
f3ff33a
@adoy adoy 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.
722b8fb
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Add new curl options
90cbe2a
@mj mj Treat "+0" and "-0" as valid integers just like var_dump() does.
This fixes bug #54096.
3990641
@mj mj Add more tests for the new +0/-0 behaviour. dcd99c4
@lstrojny lstrojny News entry for +0/-0 filter fix ee258fe
@lstrojny lstrojny Merge branch 'PHP-5.4' into PHP-5.5 f8a9a47
@lstrojny lstrojny Merge branch 'PHP-5.5' 3b022e5
@adoy adoy Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e0
Bugfix by Nikita for bug #60097
8228597
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
ae5d862
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 38150cb
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 58dabff
@laruence laruence Happy New Year 0a7395e
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 f01c295
@laruence laruence Happy New Year a666285
@laruence laruence Merge branch 'PHP-5.5' 642721b
@adoy adoy 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
343a919
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove passwd handler from struct when not needed
a63a725
@smalyshev smalyshev fix NEWS dd288f9
@smalyshev smalyshev Bug #43177: If an eval() has a parse error, the overall exit status a…
…nd 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.
36e19c9
@smalyshev smalyshev 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
80a9a80
@smalyshev smalyshev 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
6da86ac
@smalyshev smalyshev add fix #43177 86c46b9
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add fix #43177
39df129
@smalyshev smalyshev Merge branch 'PHP-5.5'
* PHP-5.5:
  add fix #43177
de81646
@smalyshev smalyshev add bug #63762 7ed2fdb
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add bug #63762
ff6b9a4
@smalyshev smalyshev Merge branch 'PHP-5.5'
* PHP-5.5:
  add bug #63762
5a27e97
@remicollet remicollet remove set but not used variables b3a8609
@remicollet remicollet Merge branch 'PHP-5.5'
* PHP-5.5:
  remove set but not used variables
a3b7d24
@johannes johannes Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	configure.in
	main/php_version.h
aaecb99
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 c2ad892
@johannes johannes Merge branch 'PHP-5.5' 0c6ce22
@smalyshev smalyshev 5.4.12-dev 5894aa0
@smalyshev smalyshev 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
a72102f
@smalyshev smalyshev 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
1dda0c5
@smalyshev smalyshev Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.12-dev
782f4ac
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 aff5d08
@laruence laruence Update NEWS 2feea39
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 c4f2a20
@laruence laruence Merge branch 'PHP-5.5' 8a2208a
@adoy adoy 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.
f85e595
@adoy adoy Merge branch 'PHP-5.5'
* PHP-5.5:
  Improve resource management for curl handle
4084a02
@lstrojny lstrojny Bug #63699 performance improvements for ext/date by only validating t…
…imezone when timezone is set
f3824ad
@lstrojny lstrojny Merge branch 'PHP-5.5' ce76ec5
@lstrojny lstrojny Bug #63699: performance improvements for varios ext/date functions 67557fc
@lstrojny lstrojny Adding test from 5.5 8e5460a
@laruence laruence Merge branch 'PHP-5.3' into PHP-5.4 c2f8e90
@laruence laruence Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 a3a699e
@laruence laruence bump year a426e0b
@lstrojny lstrojny Bug #23955: allow specifiy max age for setcookie() ec2fff8
@laruence laruence Merge branch 'PHP-5.4' into PHP-5.5 cbb5d42
@lstrojny lstrojny Merge branch 'PHP-5.5' 9fae5b6
@laruence laruence Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 742b0e5
@laruence laruence Merge branch 'PHP-5.5' 786d34f
@srgoogleguy srgoogleguy Fixes Bug #63916 PDO::PARAM_INT casts to 32bit int internally even on…
… 64bit builds in pdo_sqlite.
19b5e8a
@srgoogleguy

Resent PR against master. I have no idea why it keeps doing this.

@srgoogleguy srgoogleguy closed this
@sjlangley

Perhaps it would be a good idea to remove the date from the file to save having to make these white noise changelists.

Yep, looking at history of the files is pain because of these commits.

@themainframe

Surely this can just be in COPYRIGHT...

@nikic
Owner

Is this an important optimization? It interacts badly with argument unpacking (see https://bugs.php.net/bug.php?id=69599) and I'm wondering if it's okay to just drop it (i.e. pass nested=0 everywhere).

Of course this will make slight performance degradation, but I don't see how it may be fixed in other way.
If it doesn't affect PHP7 - go forward and fix it.

Owner

Okay, fixed in e1cb22a.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.