]>
granicus.if.org Git - php/log
K [Thu, 26 Mar 2015 18:05:38 +0000 (19:05 +0100)]
zend_hash_do_resize: amortizing the cost of compaction
New implementation of hashtables introduced a compaction step which is
triggered when a hashtable is full but it contains at least one deleted
bucket. Therefore there is a possibility that a cleverly crafted code can
trigger this compaction step (which takes time proportional to the size of
hashtabe) by executing constatnt number of operations. When the hashtable
is full, deletion and subsequent addition or single element triggers a
table compaction and these two steps can be repeated ad infinitum. This
might be avenue for a DOS attack.
This patch allows compaction to be performed only if the hashtable contains
at least 1/32 deleted elements, otherwise the hashtable is doubled in size.
Linear amount of work caused by compaction is amortized over multiple
malicious additions and deletions.
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:29:18 +0000 (03:29 +0100)]
Fix test on Windows
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:22:57 +0000 (03:22 +0100)]
Fix test on Windows
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:18:42 +0000 (03:18 +0100)]
Another CRLF test fix
Kalle Sommer Nielsen [Thu, 26 Mar 2015 02:13:50 +0000 (03:13 +0100)]
Fix tests on Windows
CRLF takes +2 bytes when running the tests, making it yield 13 instead of 11
Kalle Sommer Nielsen [Thu, 26 Mar 2015 01:03:55 +0000 (02:03 +0100)]
Minor cosmetics for our test functions in the debug build
Kalle Sommer Nielsen [Thu, 26 Mar 2015 00:59:23 +0000 (01:59 +0100)]
Added tests for the naming collision error message to handle all possible conditions
Kalle Sommer Nielsen [Thu, 26 Mar 2015 00:44:23 +0000 (01:44 +0100)]
Change the error message for colliding class/interface/trait names to be a little more clearer.
C:\> php -r "interface stdClass { }"
Error: Cannot declare interface stdClass, because the name is already in use in Command Line Code on line 1
Anatol Belski [Wed, 25 Mar 2015 18:30:38 +0000 (19:30 +0100)]
remove recognition for no more supported OSes
Xinchen Hui [Wed, 25 Mar 2015 15:42:58 +0000 (23:42 +0800)]
Fixed bug #69299 (Regression in array_filter's $flag argument in PHP 7)
Xinchen Hui [Wed, 25 Mar 2015 15:35:56 +0000 (23:35 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/opcache/Optimizer/pass1_5.c
Xinchen Hui [Wed, 25 Mar 2015 15:29:31 +0000 (23:29 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 25 Mar 2015 15:27:50 +0000 (23:27 +0800)]
Fixed Bug #69297 (function_exists strange behavior with OPCache on disabled function)
is_callable returns true for disable_functions, but function_exists
return false for it.
Anatol Belski [Wed, 25 Mar 2015 14:11:21 +0000 (15:11 +0100)]
integrate static tsrm_ls cache for ext/odbc
Anatol Belski [Wed, 25 Mar 2015 10:15:59 +0000 (11:15 +0100)]
fix datatype mismatches
Anatol Belski [Wed, 25 Mar 2015 09:59:05 +0000 (10:59 +0100)]
fix datatype mismatches
Michael Wallner [Wed, 25 Mar 2015 14:22:37 +0000 (15:22 +0100)]
RFC:continue_ob accepted
Remi Collet [Wed, 25 Mar 2015 13:31:56 +0000 (14:31 +0100)]
expose destroy_uploaded_files_hash in the API (used by apfd extension)
Anatol Belski [Wed, 25 Mar 2015 12:17:19 +0000 (13:17 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
fix dir separator in test
Anatol Belski [Wed, 25 Mar 2015 12:16:56 +0000 (13:16 +0100)]
updated bundled libsqlite to 3.8.8.3
Anatol Belski [Wed, 25 Mar 2015 12:14:42 +0000 (13:14 +0100)]
updated NEWS
Anatol Belski [Wed, 25 Mar 2015 12:13:42 +0000 (13:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
fix dir separator in test
Anatol Belski [Wed, 25 Mar 2015 12:13:03 +0000 (13:13 +0100)]
Fixed bug #69287 upgrade bundled sqlite to 3.8.8.3
Anatol Belski [Wed, 25 Mar 2015 12:11:27 +0000 (13:11 +0100)]
fix dir separator in test
Remi Collet [Wed, 25 Mar 2015 09:33:39 +0000 (10:33 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
revert
a4157423934edf7b8fdbcee163cced9bfd5748a , fix build odbc as shared
Fixed typo
Fixed typo
Remi Collet [Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
revert
a4157423934edf7b8fdbcee163cced9bfd5748a , fix build odbc as shared
Remi Collet [Wed, 25 Mar 2015 09:33:08 +0000 (10:33 +0100)]
Kalle Sommer Nielsen [Wed, 25 Mar 2015 06:01:04 +0000 (07:01 +0100)]
Constness to zend_get_object_type(), thanks Michael!
Xinchen Hui [Wed, 25 Mar 2015 05:54:49 +0000 (13:54 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 25 Mar 2015 05:54:42 +0000 (13:54 +0800)]
Fixed typo
Xinchen Hui [Wed, 25 Mar 2015 05:54:30 +0000 (13:54 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Mar 2015 05:54:12 +0000 (13:54 +0800)]
Fixed typo
Kalle Sommer Nielsen [Wed, 25 Mar 2015 05:32:29 +0000 (06:32 +0100)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Wed, 25 Mar 2015 05:31:11 +0000 (06:31 +0100)]
Change "Cannot redeclare class X" into "Cannot redeclare class/interface/trait X", meaning that the following:
C:\> php -r "trait A { } trait A { }"
Will now properly print "Cannot redeclare trait A" instead of "Cannot redeclare class A" to make error messages a tiny bit clearer. Admittedly, a better solution can most likely be made by actually telling what the colliding object is a type of.
Internally this adds a new function:
zend_get_object_type()
Kalle Sommer Nielsen [Wed, 25 Mar 2015 04:20:58 +0000 (05:20 +0100)]
The error message is actually "Cannot", not "Can't"
Xinchen Hui [Wed, 25 Mar 2015 04:10:54 +0000 (12:10 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/php_encoding.c
Xinchen Hui [Wed, 25 Mar 2015 04:10:08 +0000 (12:10 +0800)]
Update NEWS
Xinchen Hui [Wed, 25 Mar 2015 04:09:35 +0000 (12:09 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 25 Mar 2015 04:09:21 +0000 (12:09 +0800)]
UPdate NEWS
Xinchen Hui [Wed, 25 Mar 2015 04:07:25 +0000 (12:07 +0800)]
Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression)
This was a typo introduced in
c8eaca013a3922e8383def6158ece2b63f6ec483
Dmitry Stogov [Tue, 24 Mar 2015 22:57:05 +0000 (01:57 +0300)]
cleanup
Anatol Belski [Tue, 24 Mar 2015 21:01:40 +0000 (22:01 +0100)]
robuster read/write for mod ps_files
Anatol Belski [Tue, 24 Mar 2015 20:24:49 +0000 (21:24 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 20:15:15 +0000 (21:15 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 17:49:54 +0000 (18:49 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 24 Mar 2015 15:25:56 +0000 (16:25 +0100)]
ensure the test uses correct SAPI
Anatol Belski [Tue, 24 Mar 2015 13:52:00 +0000 (14:52 +0100)]
fix typo
Anatol Belski [Tue, 24 Mar 2015 06:43:53 +0000 (07:43 +0100)]
replace this version as it's unchanged since 5.4 at least
Dmitry Stogov [Tue, 24 Mar 2015 20:40:20 +0000 (23:40 +0300)]
Removed unused functions
Dmitry Stogov [Tue, 24 Mar 2015 19:56:07 +0000 (22:56 +0300)]
Reverted part committed by mistake
Dmitry Stogov [Tue, 24 Mar 2015 19:47:21 +0000 (22:47 +0300)]
Optimized strings concatenation.
ZEND_ADD_STRING/VAR/CHAR are replaced with ZEND_ROPE_INTI, ZEND_ROPE_ADD, ZEND_ROPE_END.
Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR, collect all the strings and then allocate and construct the resulting string once.
Dmitry Stogov [Tue, 24 Mar 2015 13:28:26 +0000 (16:28 +0300)]
We can't stay zend_string->h to be zero, because it may lead to hash value recalculation and update.
But in general zend_string may be put and read-only memory, that would lead to crash.
Always set the high bit of hash_value to prevent recaclulation.
Nikita Popov [Tue, 24 Mar 2015 09:48:16 +0000 (10:48 +0100)]
Fix VERIFY_RETURN separation
a) The SAME_FAKE_TYPE check should always occur on the dereferenced
value, otherwise we'll end up separating large referenced arrays.
b) For by-val return with an rc=1 reference, the SEPARATE_ZVAL
wouldn't do anything. Add a ZVAL_UNREF for this case.
I don't like this fix - there must be some better way to express
this.
Dmitry Stogov [Tue, 24 Mar 2015 09:22:11 +0000 (12:22 +0300)]
Add some assumptions.
Dmitry Stogov [Tue, 24 Mar 2015 09:21:06 +0000 (12:21 +0300)]
Introduce ZEND_ASSUME() macro to help optimizing code.
Reuse ZEND_ASSERT() conditions for optimization.
Anatol Belski [Mon, 23 Mar 2015 21:21:30 +0000 (22:21 +0100)]
fix test
Anatol Belski [Mon, 23 Mar 2015 20:30:22 +0000 (21:30 +0100)]
cleanup mod version macros and mod defs, round x
Anatol Belski [Mon, 23 Mar 2015 19:54:55 +0000 (20:54 +0100)]
cleanup mod version macros, round 3
Anatol Belski [Mon, 23 Mar 2015 19:33:54 +0000 (20:33 +0100)]
cleanup the mod version macros, round 2
Anatol Belski [Mon, 23 Mar 2015 19:13:59 +0000 (20:13 +0100)]
cleaning up the version macros
Anatol Belski [Mon, 23 Mar 2015 17:33:37 +0000 (18:33 +0100)]
export useful symbols from ext/simplexml
Anatol Belski [Mon, 23 Mar 2015 14:50:13 +0000 (15:50 +0100)]
some more UPGRADING INTERNALS notes
Anatol Belski [Mon, 23 Mar 2015 14:27:26 +0000 (15:27 +0100)]
some UPGRADING.INTERNALS notes
Anatol Belski [Mon, 23 Mar 2015 14:08:35 +0000 (15:08 +0100)]
revert yet unready stuff
Anatol Belski [Mon, 23 Mar 2015 13:47:07 +0000 (14:47 +0100)]
more fixes to the shared compilation
Anatol Belski [Mon, 23 Mar 2015 13:43:56 +0000 (14:43 +0100)]
fix exports and shared compilation
Anatol Belski [Mon, 23 Mar 2015 13:26:46 +0000 (14:26 +0100)]
fix exports
Anatol Belski [Mon, 23 Mar 2015 12:41:00 +0000 (13:41 +0100)]
indicate if an ext was forced shared globally
Anatol Belski [Mon, 23 Mar 2015 12:08:32 +0000 (13:08 +0100)]
fix shared compilation
Anatol Belski [Mon, 23 Mar 2015 11:09:44 +0000 (12:09 +0100)]
implemented --with-all-shared option
Dmitry Stogov [Mon, 23 Mar 2015 09:01:19 +0000 (12:01 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Also add preg_replace_callback_array in NEWS
update NEWS with group use declarations implementation
Dmitry Stogov [Mon, 23 Mar 2015 09:00:37 +0000 (12:00 +0300)]
Fixed PHP_CHECK_BUILTIN_EXPECT setting
Xinchen Hui [Mon, 23 Mar 2015 08:51:06 +0000 (16:51 +0800)]
Also add preg_replace_callback_array in NEWS
Xinchen Hui [Mon, 23 Mar 2015 08:49:46 +0000 (16:49 +0800)]
Merge branch 'master' of https://github.com/marcioAlmada/php-src
Anatol Belski [Sat, 21 Mar 2015 13:03:52 +0000 (14:03 +0100)]
added UPGRADING notes to ext/ftp changes
Anatol Belski [Mon, 23 Mar 2015 07:39:33 +0000 (08:39 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated libs versions
updated libs versions
Anatol Belski [Mon, 23 Mar 2015 07:38:58 +0000 (08:38 +0100)]
updated libs versions
Anatol Belski [Mon, 23 Mar 2015 07:38:25 +0000 (08:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs versions
Márcio Almada [Mon, 23 Mar 2015 07:35:11 +0000 (04:35 -0300)]
update NEWS with group use declarations implementation
Anatol Belski [Mon, 23 Mar 2015 07:35:36 +0000 (08:35 +0100)]
updated libs versions
Stanislav Malyshev [Mon, 23 Mar 2015 05:13:21 +0000 (22:13 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #68021 - get_browser() browser_name_regex
Stanislav Malyshev [Mon, 23 Mar 2015 05:12:36 +0000 (22:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed #68021 - get_browser() browser_name_regex
Tjerk Meesters [Wed, 17 Sep 2014 13:38:56 +0000 (21:38 +0800)]
Fixed #68021 - get_browser() browser_name_regex
Replaced expression delimiter with tilde (~) and escape where necessary.
Stanislav Malyshev [Mon, 23 Mar 2015 05:05:23 +0000 (22:05 -0700)]
Merge branch 'pull-request/1191'
* pull-request/1191:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Stanislav Malyshev [Mon, 23 Mar 2015 05:05:12 +0000 (22:05 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Stanislav Malyshev [Mon, 23 Mar 2015 05:04:41 +0000 (22:04 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Print checking message for all ODBC drivers
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Conflicts:
ext/odbc/config.m4
Lior Kaplan [Sun, 22 Mar 2015 20:30:32 +0000 (22:30 +0200)]
Print checking message for all ODBC drivers
This makes the output more readble in case no ODBC driver was selected
Lior Kaplan [Sun, 22 Mar 2015 20:28:16 +0000 (22:28 +0200)]
Change default option of ODBC drivers to no to enable bulding standalone ODBC
Stanislav Malyshev [Mon, 23 Mar 2015 04:56:40 +0000 (21:56 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
oops, forgot TSRMLS_CC
Conflicts:
ext/date/php_date.c
Stanislav Malyshev [Mon, 23 Mar 2015 04:55:34 +0000 (21:55 -0700)]
oops, forgot TSRMLS_CC
Stanislav Malyshev [Mon, 23 Mar 2015 04:51:58 +0000 (21:51 -0700)]
fix warning & improve error handling in CURL
Stanislav Malyshev [Mon, 23 Mar 2015 04:43:05 +0000 (21:43 -0700)]
silence warning
Stanislav Malyshev [Mon, 23 Mar 2015 04:34:13 +0000 (21:34 -0700)]
Merge branch 'pull-request/1188'
* pull-request/1188:
Reduce downstream patches
Stanislav Malyshev [Mon, 23 Mar 2015 04:33:52 +0000 (21:33 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Reduce downstream patches
lesniewskister [Fri, 20 Mar 2015 23:09:49 +0000 (20:39 -0230)]
Reduce downstream patches
As per http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/php/5.6/patches/patch-ext_gd_libgd_gdcache_h?rev=1.1&content-type=text/x-cvsweb-markup
Stanislav Malyshev [Mon, 23 Mar 2015 04:11:43 +0000 (21:11 -0700)]
Merge branch 'pull-request/1186'
* pull-request/1186:
Move check for __builtin_expect to configure
Stanislav Malyshev [Mon, 23 Mar 2015 04:05:39 +0000 (21:05 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Conflicts:
ext/date/php_date.c
Stanislav Malyshev [Mon, 23 Mar 2015 04:04:41 +0000 (21:04 -0700)]
Merge branch 'pull-request/1145'
* pull-request/1145:
Putting whitespace back to the way it was.
Updating the `DateTime_verify` test to include the new method in the reflected method list
Whoops! String length....
Adding a new test for the new method
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Stanislav Malyshev [Mon, 23 Mar 2015 03:57:46 +0000 (20:57 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
Trevor Suarez [Thu, 5 Mar 2015 06:58:09 +0000 (01:58 -0500)]
Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`