Commit Graph

39381 Commits

Author SHA1 Message Date
Stanislav Malyshev
97047e7665 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	Zend/zend_exceptions.c
	ext/date/php_date.c
	ext/openssl/openssl.c
	ext/phar/phar_internal.h
	ext/soap/php_http.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/spl/spl_observer.c
	ext/standard/tests/serialize/bug69152.phpt
	sapi/cli/tests/005.phpt
2015-08-04 16:14:24 -07:00
Stanislav Malyshev
ed709d5aa0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	ext/soap/php_http.c
	ext/spl/spl_observer.c
2015-08-04 15:29:13 -07:00
Stanislav Malyshev
69ed3969dd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  Improved fix for Bug #69441
  Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items)
  Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
  Fix bug #70081: check types for SOAP variables

Conflicts:
	.gitignore
	ext/date/php_date.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
2015-08-04 14:10:57 -07:00
Stanislav Malyshev
dda81f0505 Fix bug #70019 - limit extracted files to given directory 2015-08-04 14:02:31 -07:00
Stanislav Malyshev
0e09009753 Do not do convert_to_* on unserialize, it messes up references 2015-08-04 13:59:56 -07:00
Anatol Belski
ed8d16b173 run credits script 2015-08-04 16:30:53 +02:00
Christoph M. Becker
e39c525df8 Merge branch 'pull-request/1449'
* pull-request/1449:
  Remove unneded space(s)
2015-08-04 03:37:41 +02:00
Dmitry Stogov
472a8414cc Merge branch 'fast_memcpy' of github.com:bogdanandone/php-src
* 'fast_memcpy' of github.com:bogdanandone/php-src:
  opcache: Patch SSE based fast_memcpy() implementation
2015-08-03 15:07:26 +03:00
Dmitry Patsura
ed3c7adc5f Remove unneded space(s) 2015-08-03 18:38:41 +08:00
Dmitry Stogov
7bc6706b6d Fixed test 2015-08-03 09:11:38 +03:00
Anatol Belski
545b364d56 remove TSRMLS_*
either remains or merged in from PHP5
2015-08-02 13:42:01 +02:00
Anatol Belski
8c4bbf0f47 properly export ext/odbc globals 2015-08-02 13:05:10 +02:00
Anatol Belski
cddef30940 fix test
catching up with the localization changes in CRT
2015-08-02 09:24:19 +02:00
Stanislav Malyshev
4d2278143a Fix #69793 - limit what we accept when unserializing exception 2015-08-01 22:02:26 -07:00
Stanislav Malyshev
863bf294fe Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) 2015-08-01 22:01:51 -07:00
Stanislav Malyshev
7381b6accc Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject 2015-08-01 22:01:40 -07:00
Stanislav Malyshev
c7d3c027d5 ignore signatures for packages too 2015-08-01 22:01:32 -07:00
Stanislav Malyshev
c2e197e4ef Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage 2015-08-01 22:01:17 -07:00
Christoph M. Becker
8d31e463a0 fixed test 2015-08-01 23:52:35 +02:00
Pierrick Charron
fb37da2a48 Fixed Bug #69998 curl multi leaking memory
Fix the pointer address passed to the comparator and call
zend_list_delete instead of zend_list_close to avoid closing
the resource if still used.
2015-08-01 14:55:00 -04:00
Christoph M. Becker
78eab007a9 Merge branch 'PHP-5.6'
* PHP-5.6:
  test fails with old libxml2; skip in this case
2015-07-31 19:55:07 +02:00
Christoph M. Becker
6576d809a5 test fails with old libxml2; skip in this case 2015-07-31 19:52:42 +02:00
Christoph M. Becker
716387288e Merge branch 'PHP-5.6'
* PHP-5.6:
  test requires imagejpeg(); skip otherwise
2015-07-31 13:54:32 +02:00
Christoph M. Becker
cdabbd9542 test requires imagejpeg(); skip otherwise 2015-07-31 13:51:49 +02:00
Ferenc Kovacs
57247f01f7 removed another E_STRICT(with the approval of Derick), 3 more to go 2015-07-30 13:53:44 +02:00
Christopher Jones
70a7221540 More PHP7 compat (Rajendra/Senthil) 2015-07-30 20:25:40 +10:00
Xinchen Hui
ee64c39f8e Merge branch 'master' of git.php.net:php-src 2015-07-30 15:21:07 +08:00
Xinchen Hui
fb3d14460b Fixed condition 2015-07-30 15:09:56 +08:00
Anatol Belski
c2bf735e49 fork test 2015-07-30 09:05:07 +02:00
Xinchen Hui
6c0feb0665 Fixed bug #70163 (curl_setopt_array() type confusion) 2015-07-30 13:40:59 +08:00
Xinchen Hui
a6b47e8d68 Merge branch 'zval_dump_consistent' of https://github.com/laruence/php-src 2015-07-30 13:14:38 +08:00
Christoph M. Becker
6855e2f08b Merge branch 'pull-request/1439'
* pull-request/1439:
  fixed broken test
  add new error constant PREG_JIT_STACKLIMIT_ERROR
2015-07-29 18:21:46 +02:00
Anatol Belski
db70a337ff fix thread safety and zeroing method 2015-07-29 17:26:50 +02:00
Christoph M. Becker
ce3c869d19 Fix #70158: Building with static imap fails
Static builds of ext/imap have duplicate symbols, and so won't link on Windows.
To get around this issue, we simply disallow static building of the extension.
2015-07-29 17:00:37 +02:00
Bogdan Andone
68185bafbe opcache: Patch SSE based fast_memcpy() implementation
Use _mm_store_si128() instead of _mm_stream_si128(). This ensures that copied memory
is preserved in data cache, which is good as the interpretor will start to use this
data without the need to go back to memory. _mm_stream* is intended to be used for
stores where we want to avoid reading data into the cache and the cache pollution;
in our scenario it seems that preserving the data in cache has a positive impact.

Tests on WordPress 4.1 show ~1% performance increase with fast_memcpy() in place
versus standard memcpy() when running php-cgi -T10000 wordpress/index.php.

I also updated SW prefetching on target memory but its contribution is almost negligible.
The address to be prefetched will be used in a couple of cycles (at the next iteration)
while the data from memory will be available in >100 cycles.
2015-07-29 14:51:57 +03:00
Anatol Belski
4e66cce87c switch to the unified globals accessor where appropriate 2015-07-29 13:26:35 +02:00
Christopher Jones
0615aa82d7 Fix temporary-LOB leak and add tests (Senthil) 2015-07-29 20:15:43 +10:00
Anatol Belski
0787cd60ed first stone on using the unified globals accessor 2015-07-29 10:36:30 +02:00
Anatol Belski
7104d88c35 fix thread safety 2015-07-29 10:36:28 +02:00
Xinchen Hui
7d5fb7bbf3 Fixed bug #69674 (SIGSEGV array.c:953) 2015-07-29 10:46:12 +08:00
Xinchen Hui
94e23b29a1 online test 2015-07-28 16:43:12 +08:00
Remi Collet
80edd40383 fix memleak 2015-07-27 16:57:38 +02:00
Xinchen Hui
11613a1b58 Cleanup and also include the error path into test 2015-07-27 22:22:13 +08:00
Remi Collet
605fbabfba Fix test
Notice: we have duplicated tests
  ext/standard/tests/file/dirname_*
  ext/standard/tests/strings/dirname_*
2015-07-27 16:14:13 +02:00
Remi Collet
e811770a68 Fix #70112 RFE Allow dirname to go up various times 2015-07-27 15:23:04 +02:00
Xinchen Hui
9f56cfa9a1 Merge branch 'master' of git.php.net:php-src 2015-07-27 11:17:23 +08:00
Xinchen Hui
6aeee47b2c Fixed bug #70140 (str_ireplace/php_string_tolower - Arbitrary Code Execution) 2015-07-27 11:17:05 +08:00
Stanislav Malyshev
16023f3e3b Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes 2015-07-26 17:43:16 -07:00
Stanislav Malyshev
7a4584d3f6 Improved fix for Bug #69441 2015-07-26 17:31:12 -07:00
Stanislav Malyshev
b7fa67742c Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) 2015-07-26 17:25:25 -07:00