Compare commits

...
Author SHA1 Message Date
Remi Collet 5ce2cc5d36 fix regressio introduce in 22e23e7cb8 2015-09-16 14:37:41 +02:00
Anatol Belski e74af70780 bump release version 2015-09-15 12:54:40 +02:00
Anatol Belski 9c259329f7 Merge branch 'PHP-7.0' into PHP-7.0.0
* PHP-7.0: (102 commits)
  add missing NEWS entry
  Improve row fetch changes for PHP7. Update test SKIPIFs. Add test for 11g client (Senthil)
  Enabled placing PHP code segment into huge pages
  Enable file based cache compilation by default
  Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default.
  Removed useless include
  Avoid reallocations
  Use memcpy() instead of mmap() to keep modifyed code (e.g. gdb breakpoints)
  Fix bug #70487
  Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages. PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge pages. It's possible to enable/disable this future in php.ini through opcache.enable_huge_code_pages=0/1. The feature was tested on Linux and provided 2% improvement on real-life apps, because of 2-3 times reduction in number of iTLB misses.
  Fix mem leak in PHP7
  Add support for **= in opcache optimizer
  add overflow check
  fix data types
  add range checks
  Final diff fixes for PHP7 on base platform (some mem leaks still to be fixed).  Update driver name. Improve test portability (Senthil)
  Fixed bug #70478 (**= does no longer work)
  Manual CSE to avoid double read
  Change this as sixd suggested
  Add test XFAIL for bug #70470
  ...
2015-09-15 12:53:44 +02:00
Anatol Belski 5e5a0295c7 add missing NEWS entry 2015-09-15 08:17:25 +02:00
Christopher Jones e0193a0bef Improve row fetch changes for PHP7. Update test SKIPIFs. Add test for 11g client (Senthil) 2015-09-15 12:03:24 +10:00
Dmitry Stogov 233c42ad59 Enabled placing PHP code segment into huge pages 2015-09-15 02:04:09 +03:00
Dmitry Stogov 818e5ea5f7 Enable file based cache compilation by default 2015-09-15 01:58:32 +03:00
Dmitry Stogov c104d329e1 Use shorter php.ini directive name "opcache.huge_code_pages" and disable it by default. 2015-09-15 01:54:04 +03:00
Dmitry Stogov f2480582fb Removed useless include 2015-09-15 01:46:53 +03:00
Dmitry Stogov 927d68db24 Avoid reallocations 2015-09-14 23:04:27 +03:00
Dmitry Stogov 5c28c21159 Use memcpy() instead of mmap() to keep modifyed code (e.g. gdb breakpoints) 2015-09-14 18:42:45 +03:00
Nikita Popov ab74d80247 Fix bug #70487
Switch to * instead of + in zpp.
2015-09-14 15:04:43 +02:00
Dmitry Stogov 669f0b39b1 Added an experemental ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
PHP should be configured and built with --enable-huge-code-pages, OS should be configured to provide huge pages.
It's possible to enable/disable this future in php.ini through opcache.enable_huge_code_pages=0/1.
The feature was tested on Linux and provided 2% improvement on real-life apps, because of 2-3 times reduction in number of iTLB misses.
2015-09-14 13:34:17 +03:00
Christopher Jones 145708b658 Fix mem leak in PHP7 2015-09-14 13:29:09 +10:00
Christopher Jones 3c2d6f7f40 Merge branch 'master' of https://git.php.net/repository/php-src 2015-09-14 12:52:40 +10:00
Bob Weinand fe08b933e4 Add support for **= in opcache optimizer 2015-09-13 12:35:35 +02:00
Anatol Belski 969dcf7b61 add overflow check 2015-09-12 18:57:23 +02:00
Anatol Belski 5d035b57ee fix data types 2015-09-12 18:53:30 +02:00
Anatol Belski c6ff5be09d add range checks 2015-09-12 10:29:00 +02:00
Christopher Jones a96f99e30a Final diff fixes for PHP7 on base platform (some mem leaks still to be fixed). Update driver name. Improve test portability (Senthil) 2015-09-12 09:10:32 +10:00
Christopher Jones 4ee6a9a9a9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-09-12 09:05:41 +10:00
Bob Weinand b0174a14c0 Fixed bug #70478 (**= does no longer work)
Reordered ZEND_(ASSIGN_)POW opcodes in zend_vm_def.h so that it won't be missed in future
2015-09-12 00:54:48 +02:00
Christopher Jones 8c63d69aa9 Merge branch 'master' of https://git.php.net/repository/php-src 2015-09-12 08:51:24 +10:00
Dmitry Stogov 51aa1b5a1d Manual CSE to avoid double read 2015-09-11 14:13:41 +03:00
Xinchen Hui 465d0326d1 Change this as sixd suggested 2015-09-11 15:05:56 +08:00
Xinchen Hui 874dc06156 Merge branch 'PHP-5.6' 2015-09-11 13:52:00 +08:00
Xinchen Hui 37d814b84c Add test XFAIL for bug #70470 2015-09-11 13:45:18 +08:00
Xinchen Hui 4ddeeb49a5 Remove free_string_zval 2015-09-11 10:58:24 +08:00
Dmitry Stogov 719664dec2 fixed compilation error 2015-09-10 20:24:11 +03:00
Dmitry Stogov 1b8bf059c4 Don't keep dangling pointer. 2015-09-10 20:03:42 +03:00
Xinchen Hui 97b85364a5 Fixed Sixd :< 2015-09-10 20:14:22 +08:00
Xinchen Hui bb4c0c0703 Merge branch 'PHP-5.6' 2015-09-10 19:56:18 +08:00
Xinchen Hui a8368ddc38 Fixed bug #70431 (Memory leak in php_ini.c) 2015-09-10 19:56:13 +08:00
Xinchen Hui 66643f6192 Use efree_size 2015-09-10 16:22:07 +08:00
Xinchen Hui 213b49620d Simplfy zend_is_true 2015-09-10 16:13:22 +08:00
Xinchen Hui f3e8675d38 Added folder marks 2015-09-10 15:01:28 +08:00
Xinchen Hui 7a0e68b97c Unexpected 2015-09-10 14:57:22 +08:00
Xinchen Hui 6852f9cd43 cleanup tmp_member handling 2015-09-10 14:39:25 +08:00
Dmitry Stogov 27f6b8864e Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Aligned IntlChar protos to their ARG_INFO (related to #70453)
  Skip IntlChar related test if ext/intl is not available
2015-09-10 02:53:57 +03:00
Dmitry Stogov c174e4cd73 Change array sorting implementation to avoid two level callbacks system.
Simplify zval comparion API.
2015-09-10 02:51:23 +03:00
Christoph M. Becker 46c20ecf0a Aligned IntlChar protos to their ARG_INFO (related to #70453) 2015-09-10 01:38:15 +02:00
Christoph M. Becker 31962306f4 Skip IntlChar related test if ext/intl is not available 2015-09-10 01:31:55 +02:00
Côme Bernigaud 059dd18c37 Added support of LDAP_OPT_TIMEOUT, fixes #69574 2015-09-09 18:02:10 +02:00
Dmitry Stogov 2ea18cd431 Better array_compare improvement 2015-09-09 15:11:03 +03:00
Lior Kaplan e0f390cb72 Add entry for #70284 in 7.0.0RC2 2015-09-09 14:22:46 +03:00
Lior Kaplan 43f6099ce4 Add entry for #70284 in 5.6.13 2015-09-09 14:20:04 +03:00
Dmitry Stogov ac83eaef10 Don't inline "slow" and rarely used functions. 2015-09-09 13:42:35 +03:00
Xinchen Hui 6d885e395c Merge branch 'master' of git.php.net:/php-src 2015-09-09 18:02:27 +08:00
Xinchen Hui 59e8eae4b0 Useless ZVAL_UNDEF 2015-09-09 18:00:04 +08:00
Xinchen Hui 67d1a47887 Improved array_compare 2015-09-09 17:56:44 +08:00
Côme Bernigaud fb9d934d51 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 11:05:29 +02:00
Dmitry Stogov b1be126788 Avoid useless EG(exception) checks 2015-09-09 11:54:44 +03:00
Côme Bernigaud a483a79c85 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:34:46 +02:00
Côme Bernigaud cc7140e8d9 Merge branch 'pull-request/1512' into PHP-5.5
* pull-request/1512:
  Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
2015-09-09 10:30:17 +02:00
Xinchen Hui b00a315806 Unused var 2015-09-09 15:15:43 +08:00
Xinchen Hui 98bf9156d5 unused var 2015-09-09 15:11:42 +08:00
Christoph M. Becker 502b70c50c Merge branch 'PHP-5.6'
* PHP-5.6:
  Skip test for old glibc iconv
2015-09-09 04:33:28 +02:00
Christoph M. Becker 71da4f1f7f Skip test for old glibc iconv
bug32001.phpt has a high failure rate for the submitted reports. According to
several samples it seems the iconv implementation of glibc 2.12 (released
2010-05) is the culprit. It seems appropriate to skip the test for such old
versions.
2015-09-09 04:27:28 +02:00
Nikita Popov 7c8798834a Small cleanup in pack() implementation 2015-09-09 03:58:37 +02:00
Tyson Andre c3fc65eb7c Fix bug in LDAP extensions' saving TIMELIMIT and DEREF
LDAP_OPT_TIMELIMIT and LDAP_OPT_DEREF's original values weren't
saved properly because of a bug introduced when copy and pasting.

This lead to the original timeout being changed
when specifying a temporary override (e.g. for ldap_search(..., $timeout))
2015-09-08 18:42:02 -07:00
Christoph M. Becker 6886bb688b updated NEWS 2015-09-09 03:21:17 +02:00
Christoph M. Becker 71f90dfbad Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server

Resolved conflicts:
	ext/mysqlnd/mysqlnd_net.c
2015-09-09 03:19:55 +02:00
Christoph M. Becker b89f128480 updated NEWS 2015-09-09 03:12:59 +02:00
Dmitry Stogov c7dffb5673 Don't inline "Undefined variable" warning reporting. 2015-09-09 03:18:52 +03:00
Sergei Turchanov 7b3616db77 Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server
libmysqlclient activates TCP keep-alive when connecting to a server. PHP
mysqlnd extension must do the same to maintain compatibility.
2015-09-09 01:43:29 +02:00
Bob Weinand c12917aa45 Merged RFC Random Functions Throwing Exceptions in PHP 7
Squashes commits from PR #1397

commit cd5dcc8c9eb43603d908abcea69c9e18df0f2ed5
Author: SammyK <sammyk@sammykmedia.com>
Date:   Tue Sep 8 13:53:42 2015 -0500

    Add min max samezies

commit b719499218a4e84efecd4dc1d4235d16142c9793
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 07:00:25 2015 -0500

    Make random_bytes() throw Error when $length <= 0 and random_int() throw Error when $min > $max

commit 0cca557291c278716ec4b00b32fc2bdc1c1c8848
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 06:55:59 2015 -0500

    Make random_*() functions throw Error exception when random bytes cannot be obtained

commit 998c7f1e209123605b41139e8d9093075ce16bd6
Author: SammyK <sammyk@sammykmedia.com>
Date:   Wed Sep 2 06:41:20 2015 -0500

    Make random_*() functions throw TypeError when zend_parse_parameters fails

commit 99d305c18820ff55d82d952777cbcdf1cf0158be
Author: SammyK <sammyk@sammykmedia.com>
Date:   Mon Jul 6 19:50:47 2015 -0500

    Make exceptions less specific

commit b042dfab290713366741a663a420cf12bf802f39
Author: SammyK <sammyk@sammykmedia.com>
Date:   Mon Jul 6 17:20:13 2015 -0500

    Upgrade warnings to RuntimeExceptions
2015-09-09 01:00:29 +02:00
Dmitry Stogov aa3fd8c849 Fixed typo that might cause serious bugs in MM. May be it was the reason of bug #70392 (SIGSEGV during PHP shutdown). 2015-09-08 17:22:26 +03:00
Dmitry Stogov bfab74d574 Check EG(exception) only if it's really necessary 2015-09-08 17:20:52 +03:00
Yasuo Ohgaki 3bf9bd5e92 Fix typo in comment. 2015-09-08 18:52:31 +09:00
Yasuo Ohgaki f4c9deb452 Add URL rewrite issue note. 2015-09-08 18:50:40 +09:00
Yasuo Ohgaki ab0e347f26 Add more test cases 2015-09-08 18:44:23 +09:00
Christoph M. Becker 07c7b33028 updated NEWS 2015-09-07 23:48:14 +02:00
Christoph M. Becker 1c902e2e63 Fix #70454: IntlChar::forDigit second parameter should be optional
ZPP expects "ll" instead of "l|l" what would match the "proto" and the
ARG_INFO.
2015-09-07 23:46:12 +02:00
Christoph M. Becker 34c1755842 updated NEWS 2015-09-07 23:06:13 +02:00
Christoph M. Becker 1372909429 Fix #70453: IntlChar::foldCase() incorrect arguments and missing constants
We add missing ARG_INFO for the seconds parameter $options, and add the
respective constants IntlChar::FOLD_CASE_DEFAULT and
::FOLD_CASE_EXCLUDE_SPECIAL_I.
2015-09-07 23:02:56 +02:00
Anatol Belski f402056194 update NEWS 2015-09-07 17:35:57 +02:00
Anatol Belski b9155b851e add test for bug #70423 2015-09-07 17:31:49 +02:00
Bob Weinand 51272f4217 Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing constants) 2015-09-07 17:28:29 +02:00
Anatol Belski 585d8642b5 update NEWS 2015-09-07 17:09:19 +02:00
Anatol Belski 46792a9914 remove unnecessary check
as it's unrelated to the size pre calculation
2015-09-07 15:14:26 +02:00
Anatol Belski eaf96698c7 Fix bug #70423 Warning Internal error: wrong size calculation 2015-09-07 15:02:33 +02:00
Remi Collet db99b877f0 ext/zip version is now 1.13.0 2015-09-07 14:04:20 +02:00
Remi Collet a5d6cf788e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix build
2015-09-07 13:55:19 +02:00
Remi Collet debfc866d2 Fix build
php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
php_zip.c:1648:3: error: format not a string literal and no format arguments [-Werror=format-security]
2015-09-07 13:52:28 +02:00
Yasuo Ohgaki aa352a34fd Make sure closing save handler. 2015-09-07 04:55:08 +09:00
Yasuo Ohgaki f34b858ed0 Fix #70013: Reference to $_SESSION is lost after a call to session_regenerate_id() 2015-09-07 03:57:03 +09:00
Jakub Zelenka 22e23e7cb8 Update NEWS for OpenSSL 2015-09-06 19:13:41 +01:00
Jakub Zelenka e235cb65fb Fix request #70438: Add IV parameter for openssl_seal and openssl_open 2015-09-06 19:09:56 +01:00
Jakub Zelenka a49d394beb Fix OpenSSL record in NEWS file 2015-09-06 16:51:06 +01:00
Jakub Zelenka 473ccf47a5 Merge branch 'PHP-5.6' 2015-09-06 16:42:37 +01:00
Jakub Zelenka d47029167d Fix bug #60632: openssl_seal fails with AES 2015-09-06 16:39:59 +01:00
Christoph M. Becker 9773864661 updated NEWS 2015-09-06 15:37:35 +02:00
Christoph M. Becker 1b344f55f4 Revert "Fix #70029: nodeValue of DOMElement list content of children nodes"
This reverts commit 25a52d98d7.
2015-09-06 15:36:43 +02:00
Christoph M. Becker 892a745ef1 updated NEWS 2015-09-05 14:51:25 +02:00
Christoph M. Becker cc9da62bdb Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
	sapi/cli/php_cli_server.c
2015-09-05 14:43:19 +02:00
Christoph M. Becker aed225b7e4 updated NEWS 2015-09-05 14:39:24 +02:00
Christoph M. Becker fd94c92171 Fix #68291: 404 on urls with '+'
URI paths have to be treated according to RFC 3986 by the CLI web server, not
as application/x-www-form-urlencoded.
2015-09-05 14:34:08 +02:00
Christoph M. Becker 403974f4dc updated NEWS 2015-09-05 03:22:45 +02:00
Christoph M. Becker 28e82cc714 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70395: Missing ARG_INFO for openssl_seal()
2015-09-05 03:19:43 +02:00
Christoph M. Becker f9ece83994 updated NEWS 2015-09-05 03:14:56 +02:00
Christoph M. Becker 43b26c7b21 Fix #70395: Missing ARG_INFO for openssl_seal()
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
2015-09-05 03:08:02 +02:00
Christoph M. Becker 8355dfc41a updated NEWS and UPGRADING 2015-09-05 02:03:23 +02:00
Christoph M. Becker 25a52d98d7 Fix #70029: nodeValue of DOMElement list content of children nodes
According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.
2015-09-05 01:52:41 +02:00
Christoph M. Becker 3be54e12d5 updated NEWS 2015-09-05 01:35:16 +02:00
Christoph M. Becker c9a8733ce2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70001: Assigning to DOMNode::textContent does additional entity encoding

Resolved conflicts:
	ext/dom/node.c
2015-09-05 01:32:08 +02:00
Christoph M. Becker dc1a8dd7f0 updated NEWS 2015-09-05 01:27:59 +02:00
Christoph M. Becker b2954c64ab Fix #70001: Assigning to DOMNode::textContent does additional entity encoding
Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.
2015-09-05 01:17:50 +02:00
Christoph M. Becker 320e891f5b updated NEWS 2015-09-05 00:47:09 +02:00
Christoph M. Becker 0836d6484c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70322: ZipArchive::close() doesn't indicate errors
2015-09-05 00:43:41 +02:00
Christoph M. Becker b59ea797f5 updated NEWS 2015-09-05 00:37:08 +02:00
Christoph M. Becker c77f783777 Fix #70322: ZipArchive::close() doesn't indicate errors
If an archive can't be written, ZipArchive::close() nonetheless returns TRUE.
We fix the return value to properly return success, and additionally raise a
warning on failure.
2015-09-05 00:34:10 +02:00
Jakub Zelenka 539db00538 Simplify JSON constants registration 2015-09-04 20:00:29 +01:00
Jakub Zelenka 6e5574807f Add my name to authors for previous refactoring
Related to jsond changes
2015-09-04 19:56:59 +01:00
Jakub Zelenka 7fe2646be3 Move json_decode options macros bellow encode options 2015-09-04 19:37:12 +01:00
Ryan McCullagh 45fdff1c85 json: fix formating of PHP_JSON* option bitshifts 2015-09-04 19:29:54 +01:00
Kalle Sommer Nielsen fbfceaaa5d Merge branch 'pull-request/1497' 2015-09-04 17:59:06 +02:00
Kalle Sommer Nielsen 4481be5d26 Fix build on Windows 2015-09-04 17:49:48 +02:00
Bob Weinand 3d05785054 Merge remote-tracking branch 'origin/PHP-5.6' 2015-09-04 16:35:15 +02:00
Niklas Keller 4b1dff6f43 Fix #70361: HTTP stream wrapper doesn't close keep-alive connections 2015-09-04 16:29:35 +02:00
Márcio Almada c08b3922dd adds missing tokens to list of semi-reserved words and regenerates test suite 2015-09-04 15:02:50 +02:00
Joe Watkins 26e619b192 these need to be exported for extensions that use json 2015-09-03 19:28:34 +01:00
Anatol Belski 0f74baed9c prepare NEWS for next 2015-09-03 19:04:39 +02:00
Lior Kaplan 3bb88aee53 Align NEWS entries format 2015-09-03 19:49:07 +03:00
Lior Kaplan dbbc0e4ced Align NEWS entries format 2015-09-03 19:46:41 +03:00
Anatol Belski fcece2a7bb sync NEWS 2015-09-03 18:25:14 +02:00
Lior Kaplan 9131cf4924 Add missing variable from birdstep_commit() which got removed in e8fcd52ef 2015-09-03 18:46:07 +03:00
Lior Kaplan 23b88d38e8 Align NEWS entries format 2015-09-03 17:53:53 +03:00
Lior Kaplan abf0ede0ac Add CVE for #70140 (PHP 7.0.0 Beta 3) 2015-09-03 17:51:07 +03:00
Xinchen Hui 49ee37d870 Seems master is not affected 2015-09-02 23:15:57 -07:00
Xinchen Hui d5b78cec64 We should keep one refcount to resource 2015-09-02 22:14:48 -07:00
Xinchen Hui 6815c08e29 Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex) 2015-09-02 22:07:29 -07:00
Xinchen Hui 6290344d96 Fixed test 2015-09-02 21:59:36 -07:00
Levi Morrison 432dc527ad Partially fix bug #67167 - Wrong return value...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE

The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
2015-09-02 18:23:26 -06:00
Ferenc Kovacs 4388eba510 Merge branch 'PHP-5.6'
* PHP-5.6:
  move the phpdbg NEWS entry to the correct version
2015-09-03 01:58:29 +02:00
Ferenc Kovacs 52b2a3ff25 move the phpdbg NEWS entry to the correct version 2015-09-03 01:58:13 +02:00
Ferenc Kovacs ece397ef0f Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing news entries
2015-09-03 01:47:17 +02:00
Ferenc Kovacs 3759de241f add missing news entries 2015-09-03 01:46:38 +02:00
Anatol Belski d03e8e0e87 sync NEWS 2015-09-02 22:12:15 +02:00
Anatol Belski 4401f56eef bump version 2015-09-02 22:10:25 +02:00
Anatol Belski 6ef7c6358f Merge branch 'master' into PHP-7.0.0
* master: (201 commits)
  sync NEWS
  Add missing variable from birdstep_commit() which got removed in e8fcd52ef
  Align NEWS entries format
  Add CVE for #70140 (PHP 7.0.0 Beta 3)
  Seems master is not affected
  We should keep one refcount to resource
  Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
  Fixed test
  Partially fix bug #67167 - Wrong return value...
  move the phpdbg NEWS entry to the correct version
  add missing news entries
  Skip if ext/filter isn't loaded
  Merge branch 'PHP-5.6'
  5.5.30 next
  Use ZSTR_VAL
  fix dir separators in test
  use correct api
  fix leak
  cleanup an atavism
  add overflow check
  ...
2015-09-02 22:08:24 +02:00
Levi Morrison 730496b899 Skip if ext/filter isn't loaded 2015-09-02 10:12:08 -06:00
Julien Pauli 1f0045d44a Merge branch 'PHP-5.6'
* PHP-5.6:
  Merge branch 'PHP-5.6'
  bump version
2015-09-02 17:56:49 +02:00
Julien Pauli c65350cd4d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Merge branch 'PHP-5.6'
  bump version
2015-09-02 17:55:57 +02:00
Julien Pauli bb98ed600a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Merge branch 'PHP-5.6'
  bump version

Conflicts:
	configure.in
	main/php_version.h
2015-09-02 17:55:20 +02:00
Matteo Beccati a12cef979d Merge branch 'PHP-5.6'
* PHP-5.6:
  Added missing skipif for phar+zlib test
2015-09-02 17:53:36 +02:00
Julien Pauli 60e2207c34 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.5.30 next
  More fixes for bug #70219

Conflicts:
	ext/pcre/php_pcre.c
	ext/session/session.c
2015-09-02 17:51:02 +02:00
Julien Pauli c07150cd1a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.30 next

Conflicts:
	configure.in
	main/php_version.h
2015-09-02 17:42:00 +02:00
Julien Pauli ea807f9c07 5.5.30 next 2015-09-02 17:40:56 +02:00
Xinchen Hui 7cf8df5597 Merge branch 'master' of git.php.net:/php-src 2015-09-02 23:36:43 +08:00
Xinchen Hui 1cfd12d618 Use ZSTR_VAL 2015-09-02 23:36:13 +08:00
Xinchen Hui 362f787b75 Merge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src 2015-09-02 23:28:51 +08:00
Anatol Belski ebb6f5eae6 fix dir separators in test 2015-09-02 17:26:35 +02:00
Anatol Belski 2d72a17ab9 use correct api 2015-09-02 17:25:00 +02:00
Anatol Belski 45a72785b5 fix leak 2015-09-02 17:20:24 +02:00
Anatol Belski 59d3529f29 cleanup an atavism
no DOS support here )
2015-09-02 17:05:47 +02:00
Anatol Belski 9d82a7dc98 add overflow check 2015-09-02 17:05:45 +02:00
Anatol Belski 95ac779956 remove unnecessary macros 2015-09-02 17:05:43 +02:00
Dmitry Stogov 6848cb3f63 Use regular huge pages instead of anonymous if available. 2015-09-02 15:55:41 +03:00
Dmitry Stogov 111bd5d8c4 Introduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV during PHP shutdown) 2015-09-02 13:05:12 +03:00
Dmitry Stogov a2f8a7675b Prevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions). 2015-09-02 13:03:31 +03:00
Stanislav Malyshev 9c35f87e9a Temporary add XFAILs, will fix soon 2015-09-02 01:23:40 -07:00
Stanislav Malyshev 6640aded24 fix memory leak 2015-09-02 01:21:47 -07:00
Stanislav Malyshev c18f662e3c Merge remote-tracking branch 'origin/master'
* origin/master:
  Add test for ReflectionMethod::getPrototype_basic()
  Added two tests to check the main functionallity of recode extension
  Doubles are not refcounted
  Fix #32490: constructor of mysqli has wrong name
2015-09-02 01:00:16 -07:00
Stanislav Malyshev 9b1a224d4e Merge branch 'PHP-5.6'
* PHP-5.6: (21 commits)
  fix unit tests
  update NEWS
  add NEWS for fixes
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  ...

Conflicts:
	ext/exif/exif.c
	ext/gmp/gmp.c
	ext/pcre/php_pcre.c
	ext/session/session.c
	ext/session/tests/session_decode_variation3.phpt
	ext/soap/soap.c
	ext/spl/spl_observer.c
	ext/standard/var.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	ext/xsl/xsltprocessor.c
2015-09-02 00:37:20 -07:00
Davey Shafik 9ec6a44c5e Add CURLPIPE_* constants to properly expose HTTP/2 multiplexing 2015-09-02 17:16:43 +12:00
marcosptf 519016096f Add test for ReflectionMethod::getPrototype_basic() 2015-09-02 00:28:46 +02:00
Daniel Persson c98b88aafe Added two tests to check the main functionallity of recode extension 2015-09-02 00:11:45 +02:00
Hannes Magnusson 874dcd8f73 Doubles are not refcounted 2015-09-01 14:52:04 -07:00
Stanislav Malyshev 51fca4b77d bump version 2015-09-01 13:12:16 -07:00
Stanislav Malyshev a6c063d663 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  More fixes for bug #70219
2015-09-01 12:51:48 -07:00
Christoph M. Becker b15eff6386 Fix #32490: constructor of mysqli has wrong name
As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().
2015-09-01 21:44:16 +02:00
Stanislav Malyshev 3fe509443c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix unit tests
2015-09-01 12:24:14 -07:00
Stanislav Malyshev 43c2dfa7b3 Merge branch 'PHP-5.5' into PHP-5.5.29
* PHP-5.5:
  fix unit tests
2015-09-01 12:24:06 -07:00
Stanislav Malyshev 4aeff30337 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix unit tests
2015-09-01 12:23:55 -07:00
Stanislav Malyshev 1922c650ba fix unit tests 2015-09-01 12:23:22 -07:00
Stanislav Malyshev c19d59c550 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  add NEWS for fixes
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	ext/zip/php_zip.c
2015-09-01 12:06:41 -07:00
Stanislav Malyshev 45e7e79485 Merge branch '70284' into PHP-5.6
* 70284:
  Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
2015-09-01 12:05:02 -07:00
Stanislav Malyshev 32fe02c27d Merge branch 'PHP-5.5' into PHP-5.5.29
* PHP-5.5:
  update NEWS
  add NEWS for fixes
2015-09-01 12:04:04 -07:00
Stanislav Malyshev 31b634bf7c update NEWS 2015-09-01 12:03:48 -07:00
Stanislav Malyshev 0fac73a3bf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add NEWS for fixes
2015-09-01 12:00:30 -07:00
Stanislav Malyshev 7ceb0e3a18 add NEWS for fixes 2015-09-01 11:53:59 -07:00
Stanislav Malyshev 53d274beb0 Merge branch 'PHP-5.5' into PHP-5.5.29
* PHP-5.5:
  Improve fix for #70172
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)

Conflicts:
	ext/pcre/php_pcre.c
2015-09-01 11:43:27 -07:00
Stanislav Malyshev 33d3acaae7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	configure.in
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h
2015-09-01 11:42:19 -07:00
Stanislav Malyshev 48cfd1160b Merge branch 'PHP-5.4.45' into PHP-5.4
* PHP-5.4.45:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
2015-09-01 11:40:15 -07:00
Stanislav Malyshev 7c31203935 Improve fix for #70172 2015-09-01 11:38:39 -07:00
Bob Weinand 50d6fd6a03 Fixed bug #70397 (Segmentation fault when using Closure::call and yield) 2015-09-01 18:04:19 +02:00
Joe Watkins a8a3b02fd9 fix for --enable-zend-signals and ZTS
temporary fix to make queue size bigger in zend_signal while I work on it
2015-09-01 16:51:40 +01:00
Joe Watkins ccba374faf Merge branch 'master' of https://github.com/php/php-src 2015-09-01 11:00:45 +01:00
Dmitry Stogov d8eee72a84 Fixed possible caching with invalid key value 2015-09-01 12:56:33 +03:00
Joe Watkins 85a511d2c1 fix zend signal and tsrm compat 2015-09-01 09:34:54 +01:00
Stanislav Malyshev e2291e4b1a Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
2015-09-01 01:17:12 -07:00
Stanislav Malyshev 1390a5812b Fix bug #70312 - HAVAL gives wrong hashes in specific cases 2015-09-01 01:16:30 -07:00
Stanislav Malyshev 3605d1baf5 Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
  fix test
2015-09-01 00:59:55 -07:00
Stanislav Malyshev 906f19f136 fix test 2015-09-01 00:59:31 -07:00
Dmitry Stogov bb4b50636c Fixed one more problem related to bug #70187 (Notice: unserialize(): Unexpected end of serialized data) 2015-09-01 10:39:00 +03:00
Stanislav Malyshev 6935058a98 Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)

Conflicts:
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
2015-09-01 00:28:39 -07:00
Stanislav Malyshev c8f07ad477 add test 2015-09-01 00:26:12 -07:00
Stanislav Malyshev 259057b2a4 Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList 2015-09-01 00:20:45 -07:00
Stanislav Malyshev f06a069c46 Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage 2015-09-01 00:14:15 -07:00
Stanislav Malyshev e8429400d4 Fix bug #70172 - Use After Free Vulnerability in unserialize() 2015-08-31 23:26:14 -07:00
Stanislav Malyshev e201f01ac1 Fix bug #70388 - SOAP serialize_function_call() type confusion 2015-08-31 21:06:03 -07:00
Dmitry Stogov 66770f9c37 Added missing set of fcc->initialized flag. 2015-09-01 03:15:50 +03:00
Bob Weinand 84b608de10 Fix valgrind warning upon displaying lines from eval()ed code in phpdbg 2015-08-31 23:42:15 +02:00
Dmitry Stogov 89aa1b7392 Ensure proper data alignment 2015-08-31 13:56:42 +03:00
Dmitry Stogov 37f0c6b5cb Add myself into list of authors of the most refactored files. 2015-08-31 11:38:16 +03:00
Bob Weinand 54a831829a Respect exit status for -rr option with phpdbg 2015-08-30 20:25:10 +02:00
Xinchen Hui 5f006ade64 Merge branch 'patch-8' of https://github.com/ovr/php-src 2015-08-30 08:02:17 -07:00
Xinchen Hui a68e577b4e Merge branch 'master' of https://github.com/softwarespot/php-src 2015-08-30 08:00:15 -07:00
Xinchen Hui 871545fdd0 Merge branch 'PHP-5.6' 2015-08-30 05:34:31 -07:00
Xinchen Hui 9da99d8c5f Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 2015-08-30 05:34:15 -07:00
Xinchen Hui 014abbc840 Merge branch 'PHP-5.6'
Conflicts:
	ext/pdo/pdo_dbh.c
	ext/pdo/php_pdo_driver.h
2015-08-30 05:32:37 -07:00
Xinchen Hui ef1bd8f0e6 Fixed bug #70389 (PDO constructor changes unrelated variables) 2015-08-30 05:02:38 -07:00
Stanislav Malyshev f9c2bf73ad Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories 2015-08-30 00:38:08 -07:00
Stanislav Malyshev ce2c67c8e8 Improve fix for #70385 2015-08-29 23:01:36 -07:00
Anatol Belski d7cd2d7bd6 fix possible overflow 2015-08-29 20:14:07 +02:00
Anatol Belski 0245d6c6a3 use non deprecated symbols 2015-08-29 20:12:31 +02:00
Matteo Beccati cb5582d3c1 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added missing skipif for phar+zlib test
2015-08-29 10:48:53 +02:00
Matteo Beccati 9d816f1bcf Added missing skipif for phar+zlib test 2015-08-29 10:47:02 +02:00
Matteo Beccati 6b3e44369d Fixed bug #70386 Can't compile on NetBSD because of missing WCONTINUED
since 90114a3e93
2015-08-29 08:07:45 +02:00
Stanislav Malyshev 03964892c0 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) 2015-08-28 22:52:50 -07:00
Stanislav Malyshev 64043cb9e5 Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) 2015-08-28 22:25:41 -07:00
Stanislav Malyshev fc8eff897b More fixes for bug #70219 2015-08-28 21:50:21 -07:00
Nikita Popov ccec609b82 Fix bug #62441
These checks were introduced by 8646d9afce
back when name resolution was working differently.
2015-08-28 19:00:05 +02:00
Nikita Popov 7f2261d24a Fix HT_ASSERT ht->nInternalPointer checks
The & was on the wrong side...
2015-08-28 18:59:46 +02:00
Dmitry Stogov 127db5a37d HANDLE_BLOCK_INTERRUPTIONS() is not used by SAPIs anymore. It may be useful only when PHP configured with --enable-zend-signals. 2015-08-28 16:10:07 +03:00
Anatol Belski 7e3fb94461 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in test
  fix path separator in test
  fix test
2015-08-28 14:49:14 +02:00
Dmitry Stogov 8da0aeaa13 Removed signal protection (set to NULL before free() to avoid dangling pointers) 2015-08-28 15:32:50 +03:00
Dmitry Stogov 87f0f77105 Simplified integer overflow checks 2015-08-28 12:47:21 +03:00
Anatol Belski 00eebd7a47 fix dir separator in test 2015-08-28 11:39:26 +02:00
Dmitry Stogov 5d15d2b26d Removed useless signal protection 2015-08-28 12:39:18 +03:00
Anatol Belski 5d2294e8b8 fix path separator in test 2015-08-28 11:38:16 +02:00
Anatol Belski ebdd9cf6e8 fix test 2015-08-28 11:29:38 +02:00
Adam Harvey de63ebf5f4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix NEWS indentation.
  Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
2015-08-27 16:01:33 -07:00
Adam Harvey 4ddc4af87c Fix NEWS indentation. 2015-08-27 16:00:36 -07:00
Adam Harvey e872f4d9c1 Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
Fixes bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when building
extensions).
2015-08-27 15:59:59 -07:00
Jakub Zelenka 0a3f2caa6c Remove merged bug #55259 info from PHP 7 NEWS 2015-08-27 21:44:38 +01:00
Jakub Zelenka e4f9354615 Merge branch 'PHP-5.6' 2015-08-27 21:43:57 +01:00
Jakub Zelenka a5864d9917 Update NEWS with info about bug #55259 2015-08-27 21:37:59 +01:00
Dmitry Stogov 745753eacb Prevent double load on fast path (manual common subexpression elimination) 2015-08-27 23:02:15 +03:00
Jakub Zelenka 6b9f31ab74 Merge branch 'PHP-5.6' 2015-08-27 20:17:33 +01:00
Xinchen Hui 859712a89c remove redundant ; 2015-08-27 13:05:41 +08:00
Xinchen Hui aa24209855 Enable format checking for strpprintf 2015-08-27 11:42:50 +08:00
Xinchen Hui c359ca8c3d Fixed printing 2015-08-27 11:38:11 +08:00
softwarespot 76a0cbc0c2 Removed trailing whitespace 2015-08-26 22:24:46 +03:00
Anatol Belski b795ce6de5 make overflow checks as unexpected
it's supposed to mark an error case
2015-08-26 21:12:41 +02:00
Jakub Zelenka ad028ebc11 Use new range checks in openssl ext 2015-08-26 19:55:29 +01:00
Dmitry Stogov e549ebdb23 Mark parse error functions as cold 2015-08-26 18:29:42 +03:00
Dmitry Stogov 942747cc3e Removed unused functions 2015-08-26 18:29:23 +03:00
Anatol Belski 95073c8429 fix year in the header 2015-08-26 17:10:23 +02:00
Anatol Belski 150dead2d9 add range check to ext/soap 2015-08-26 16:39:54 +02:00
Anatol Belski 1553ce2093 add some range checks to pcre 2015-08-26 16:39:53 +02:00
Anatol Belski ce3e3f7884 more range checks in ext/tidy 2015-08-26 16:39:52 +02:00
Anatol Belski 871acceace add range checks to ext/tidy 2015-08-26 16:39:51 +02:00
Anatol Belski 201afce875 add some range checks to ext/dom 2015-08-26 16:39:50 +02:00
Anatol Belski a3dceb485a fix test 2015-08-26 16:39:48 +02:00
Anatol Belski 2c523f21c9 add range checks to simplexml 2015-08-26 16:39:47 +02:00
Anatol Belski d40a149ade fix typo 2015-08-26 16:39:46 +02:00
Anatol Belski c867b510df include range checks with the portability header 2015-08-26 16:39:45 +02:00
Anatol Belski e2ce37be6a added basic stuff with the zend_range_check.h 2015-08-26 16:39:44 +02:00
Dmitry Stogov 1f0f768e3f Avoid duplication 2015-08-26 14:53:41 +03:00
Christopher Jones 22ad36428a Merge branch 'master' of https://git.php.net/repository/php-src 2015-08-26 21:24:05 +10:00
Christopher Jones a52902faf4 Squash some more PHP 7 diffs and improve test portability (Senthil) 2015-08-26 21:22:58 +10:00
Stanislav Malyshev 24dda816d0 Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  5.4.45 next

Conflicts:
	configure.in
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h
2015-08-25 23:08:49 -07:00
Niklas Keller 91712c35f8 Fix Typos: exteption -> exception 2015-08-26 07:30:56 +02:00
Christopher Jones 371eba811f Merge branch 'master' of https://git.php.net/repository/php-src 2015-08-26 14:35:41 +10:00
Dmitry Stogov 25f9e25526 Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data) 2015-08-26 03:27:05 +03:00
Bob Weinand c1e9bd27fe Fix zend_vm_call_opcode_handler (e.g. Generators throwing exceptions) with IP/FP registers 2015-08-26 00:25:25 +01:00
Dmitry Stogov 9d31b29705 Avoid array duplication 2015-08-25 22:40:33 +03:00
Jakub Zelenka c39336d1d8 Fix bug #55259 (openssl extension does not get the DH parameters from DH key resource) 2015-08-25 20:26:11 +01:00
Christoph M. Becker 2455ab2a2b Remove superfluous forward declaration
mysqli_get_cache_stats() has been removed with commit f9ad56e; we're finally
getting rid of its remaining forward declaration.
2015-08-25 14:26:55 +02:00
Anatol Belski 7366e29662 fix build, use exported symbol 2015-08-25 10:39:43 +02:00
Dmitry Patsura 2391ec73c1 TravisCI - remove unneded code 2015-08-25 12:33:15 +08:00
Dmitry Stogov 2482325b3d Assign CPU registers for GOTO and SWITCH executor as well 2015-08-25 02:38:06 +03:00
Christoph M. Becker a8d38674b1 updated NEWS 2015-08-24 23:16:21 +02:00
Christoph M. Becker 405f8b5c91 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #67131: setcookie() conditional for empty values not met

Resolved conflicts:
	ext/standard/head.c
2015-08-24 23:11:03 +02:00
Christoph M. Becker e5adf2b427 updated NEWS 2015-08-24 23:05:18 +02:00
Christoph M. Becker fc203fa37e Fix #67131: setcookie() conditional for empty values not met
PHP applies a workaround for old MSIE where setting an empty cookie value would
not delete the cookie. This workaround is only triggered if an empty string (or
a value that converts to an empty string) is actually given as $value parameter
of setcookie. If the $value parameter is omitted, an empty cookie value is
sent. This commit fixes the inconsistent behavior.
2015-08-24 23:03:50 +02:00
Dmitry Stogov f9f568aa1e In 95% cases we initialize "empty" array (with 8 hash slots). 2015-08-24 22:07:28 +03:00
Dmitry Stogov 96ea4a0ac6 Mark error functions as "cold" 2015-08-24 18:07:59 +03:00
Xinchen Hui fd5e0dc3c6 Fixed bug #70342 (changing configuration with ignore_user_abort(true) isn't working) 2015-08-24 21:09:16 +08:00
Bob Weinand 6b3228fda4 Fix oplog with eval()ed code 2015-08-24 12:28:35 +01:00
Dmitry Stogov db5898c9e5 Optimize fast path 2015-08-24 12:47:06 +03:00
Stanislav Malyshev df4bf28f9f Fix bug #70219 (Use after free vulnerability in session deserializer) 2015-08-23 19:56:12 -07:00
Stanislav Malyshev d735957cb5 Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP) 2015-08-23 16:08:07 -07:00
Anatol Belski b928ea2de7 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
  fix test
  fix test
  fix test
2015-08-23 22:56:51 +02:00
marcosptf d536ecac5c added test for gzgetss() 2015-08-23 17:55:23 +02:00
Anatol Belski 78b2b1d6f7 fix test
backport from master
2015-08-23 17:27:55 +02:00
Anatol Belski b460b530d6 fix test
backport from master
2015-08-23 17:27:53 +02:00
Anatol Belski 24e78ec1d8 fix test 2015-08-23 17:27:51 +02:00
Anatol Belski 5786f86656 fix test
backported from master
2015-08-23 17:27:50 +02:00
Xinchen Hui c68fa93de5 Merge branch 'master' of git.php.net:php-src 2015-08-23 20:42:10 +08:00
Xinchen Hui f56534e4b9 Fixed Bug #70332 (Wrong behavior while returning reference on object)
This fix is actually made for array acessing bug fix (#70262) which is
discarded since we have another better fix, anyway now seems this is still useful
2015-08-23 20:17:51 +08:00
Bob Weinand 45ae47a149 Merge remote-tracking branch 'origin/PHP-5.6' 2015-08-23 12:19:31 +01:00
Bob Weinand 272cccd175 Fix phpdbg_break_next() 2015-08-23 12:07:14 +01:00
Bob Weinand e9f21a3388 Fix phpdbg_break_next() and add test 2015-08-23 11:58:45 +01:00
Xinchen Hui 4df6f26442 Fixed bug #70330 (Segmentation Fault with multiple "curl_copy_handle") 2015-08-23 13:01:47 +08:00
Xinchen Hui 55f88141c5 Re-Fixed bug #70321 (Magic getter breaks reference to array property) 2015-08-23 11:42:33 +08:00
Xinchen Hui e26a04f9ec Revert "Fixed bug #70321 (Magic getter breaks reference to array property)"
This reverts commit 66754585f8.
2015-08-23 10:40:28 +08:00
Bob Weinand 66754585f8 Fixed bug #70321 (Magic getter breaks reference to array property)
Note that the UNEXPECTED(zv) was turned into EXPECTED(zv), as zv is mostly set in the context where it is used and usually anyway is checked first with OP*_TYPE == IS_VAR; or maybe just completely remove that (UN)EXPECTED at this place...
2015-08-22 23:54:59 +01:00
Bob Weinand 76e3e99dd6 Fix issues with phpdbg SIGINT handler
Also fix valgrind warnings in allocator when not using mmap()ed memory
2015-08-21 23:36:31 +01:00
Anatol Belski f9ae74a4c0 make this test Windows only
as we're not in control of the libxml builds everywhere
2015-08-21 19:47:17 +02:00
Anatol Belski ac2f6ddd4f here string isn't supported by every shell 2015-08-21 19:11:53 +02:00
Ferenc Kovacs 5ed1b70841 $() isn't supported on every shell 2015-08-21 18:27:03 +02:00
Anatol Belski 83a055c3da Merge branch 'PHP-5.6'
* PHP-5.6:
  fix tests
  fix dir separator
  fix dir separator in test
  fix dir separator in test
2015-08-21 15:48:03 +02:00
Anatol Belski 2b9c7f881a fix tests 2015-08-21 15:13:39 +02:00
Anatol Belski aa23bc6d1d fix dir separator 2015-08-21 14:08:33 +02:00
Anatol Belski 9e69ef4ce2 fix dir separator in test 2015-08-21 14:05:58 +02:00
Anatol Belski e8f37fe3dc fix dir separator in test 2015-08-21 14:04:08 +02:00
Xinchen Hui 5a37056efa unnecessary 1 byte allocted 2015-08-21 18:28:02 +08:00
Anatol Belski 13044447eb add test for bug 70309 2015-08-21 11:47:00 +02:00
Anatol Belski 03f6ffd1d7 note to UPGRADING 2015-08-21 10:48:25 +02:00
Bob Weinand 823062d6c1 Fix invalid range error by gawk in order_by_dek.awk 2015-08-21 00:13:03 +02:00
Bob Weinand 82b73fd1e3 Remove assumption that extensions are in ext/ext-name
Fixes also a weird ln (symlink) hack for phpdbg
2015-08-21 00:13:02 +02:00
Sara Golemon a3eed5fbfe Move __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defs earlier
These defines should apply to windows as well,
so move them out of the non-windows specific section
and always define them for C++ compilations.
2015-08-20 14:40:08 -07:00
Bob Weinand 5ece3ec71c Fix bogus traces with ReflectionGenerator::getTrace() 2015-08-20 23:24:28 +02:00
Sara Golemon 29a8981c81 Enable definitions of stdint.h limits/constants used by Zend/zend_long.h
Define __STDC_LIMITS_MACROS and __STDC_CONSTANT_MACROS
prior to including stdint.h for the first time so that it
defines the INT64_MAX / INT64_C / etc... macros we use elsewhere
when building for C++ (C already gets these).
2015-08-20 11:34:44 -07:00
Jakub Zelenka 7ad1703413 Add overflow check for openssl_pkcs12_read 2015-08-20 19:29:54 +01:00
Anatol Belski ef063dcb05 one new line too much 2015-08-20 13:32:30 +02:00
Anatol Belski 4ad0714d76 fork test 2015-08-20 13:32:29 +02:00
Nikita Popov ef7d822c32 Remove path from test 2015-08-20 12:58:36 +02:00
Nikita Popov 186b0f3770 Don't allow leading \ in group use decl list
We recently added support for "use \Foo\{Bar}". This commit drops
support for the reverse "use Foo\{\Bar}". Those two got mixed up
in the initial implementation.
2015-08-20 11:47:43 +02:00
Ferenc Kovacs 4d7a8f119e Merge branch 'PHP-5.6'
* PHP-5.6:
  5.6.14 next
2015-08-20 09:57:49 +02:00
Ferenc Kovacs c7c9858ba1 5.6.14 next 2015-08-20 09:56:47 +02:00
Christopher Jones af76506830 Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored) 2015-08-20 14:09:30 +10:00
Christopher Jones f8ee809e22 Merge branch 'master' of https://git.php.net/repository/php-src 2015-08-20 13:57:39 +10:00
Christoph M. Becker 7373da78fe Merge branch 'pull-request/1471'
* pull-request/1471:
  add test for php_enchant_broker_free()
2015-08-19 22:27:39 +02:00
marcosptf bf340ec417 add test for php_enchant_broker_free() 2015-08-19 22:25:29 +02:00
Christoph M. Becker 8e9e1b7da3 Merge branch 'pull-request/1472'
* pull-request/1472:
  This is a new test for enchant_broker_free_dict(). This function never was covered by .phpt
2015-08-19 22:16:42 +02:00
marcosptf d085100a52 This is a new test for enchant_broker_free_dict().
This function never was covered by .phpt
2015-08-19 22:15:40 +02:00
Christoph M. Becker 533c11386f Merge branch 'pull-request/1475'
* pull-request/1475:
  testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:59:40 +02:00
marcosptf 9a4b0dbe40 testing enchant_broker_(g|s)et_dict_path 2015-08-19 21:57:42 +02:00
Jakub Zelenka c3f0c87564 Add overflow checks for openssl_pkey_* functions 2015-08-19 20:10:14 +01:00
Jakub Zelenka 478ecc674b Move overflow checks in openssl_pbkdf2 2015-08-19 20:06:58 +01:00
Anatol Belski 09970d8031 Revert "fix occasional fail in zip_close when target arc exists"
This reverts commit ed78d59a1d.
2015-08-19 19:00:53 +02:00
Anatol Belski e6aa1fb249 fix config.w32 to include suitable lib files 2015-08-19 19:00:51 +02:00
Dmitry Stogov 30dcb2d662 Fixed typo 2015-08-19 19:15:30 +03:00
Christoph M. Becker 569023cde6 updated NEWS 2015-08-19 16:35:17 +02:00
Christoph M. Becker 361fb5baaa Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70303: Incorrect constructor reflection for ArrayObject
2015-08-19 16:33:40 +02:00
Christoph M. Becker 6c99cb2929 updated NEWS 2015-08-19 16:25:59 +02:00
Christoph M. Becker 484b92919b Fix #70303: Incorrect constructor reflection for ArrayObject
The first parameter of ArrayObject::__construct() is optional. Reflection
should reflect this.
2015-08-19 16:23:16 +02:00
Anatol Belski 026b41ba66 improve error message 2015-08-19 15:23:23 +02:00
Anatol Belski ed78d59a1d fix occasional fail in zip_close when target arc exists 2015-08-19 15:23:21 +02:00
Dmitry Stogov c97427ea8e Fixed typo in proper place 2015-08-19 15:45:39 +03:00
Dmitry Stogov 3350faf7e4 Fixed typo 2015-08-19 15:15:17 +03:00
Dmitry Stogov 71af54e5f6 Mark error and exception functions as "cold" (Matt's idea) 2015-08-19 14:40:56 +03:00
Xinchen Hui 066f6f6ad8 Merge branch 'PHP-5.6' 2015-08-19 18:41:46 +08:00
Xinchen Hui b584b51398 Fixed bug #70290 (Null pointer deref (segfault) in spl_autoload via ob_start) 2015-08-19 18:41:28 +08:00
Dmitry Stogov 9b1570a378 Removed deprecated comments and added expectations (overloaded properties and array elements are less frequently used than regular ones) 2015-08-19 12:21:14 +03:00
Anatol Belski 1bb5479d06 update NEWS 2015-08-19 11:07:40 +02:00
Anatol Belski 0562ec85df Fix bug #70145 From field incorrectly parsed from headers 2015-08-19 11:05:35 +02:00
Anatol Belski 7f4ae19c80 added /guard:cf to release builds 2015-08-19 10:56:43 +02:00
Anatol Belski 3708d9c1b4 use the bare tarball filename for the stub, no path elements 2015-08-19 10:51:15 +02:00
Xinchen Hui a44abef8b2 Update NEWs 2015-08-19 16:34:26 +08:00
Xinchen Hui 574e8966a4 Merge branch 'master' of https://github.com/marcioAlmada/php-src 2015-08-19 16:30:28 +08:00
Xinchen Hui c89bd3f3c3 This bug is already fixed, but it's better to have a bug entry for the record 2015-08-19 10:47:08 +08:00
Christopher Jones 9047b567e3 Resolve build warnings. Bump ver. Better range check. Fix diffs 2015-08-19 10:42:53 +10:00
Bob Weinand 4df77a6c58 Fixed bug #70295 (Segmentation fault with setrawcookie) 2015-08-19 01:33:19 +02:00
Márcio Almada 7568d5cb89 fixes a syntactical inconsistency with group use and leading \
discussion: http://news.php.net/php.internals/87774
2015-08-18 19:23:58 -03:00
Anatol Belski 32462a8076 correct NEWS 2015-08-18 23:27:49 +02:00
Christoph M. Becker 3d8214a021 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #67604: The built windows documention refers to nonexistent dll
2015-08-18 21:26:09 +02:00
Christoph M. Becker c12aa3c7ce Fix #67604: The built windows documention refers to nonexistent dll
Since quite a while the Windows builds ship with php5apache2_4.dll, but not
with other server modules. We fix some out-dated info in install.txt.
2015-08-18 21:21:28 +02:00
Jakub Zelenka 6a201b3651 Use macros for openssl overflow checks
It reduces code duplications
2015-08-18 20:17:04 +01:00
Anatol Belski b7e910e969 update NEWS 2015-08-18 21:04:33 +02:00
Bob Weinand ab57205019 Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1) 2015-08-18 21:02:53 +02:00
Jakub Zelenka 618c327a56 Fix possible overflow in openssl_pbkdf2
Especially key_length would lead to the crash if it overflowed
to the negative value.
2015-08-18 19:46:59 +01:00
Anatol Belski 000be61fb8 NEWS for next 2015-08-18 20:31:37 +02:00
Xinchen Hui a02b3fd4b0 Fixed memleak in Zend/tests/bug39297 2015-08-18 17:49:38 +02:00
Joe Watkins 784dd715e4 Fix mangled property names on anon classes 2015-08-18 16:37:38 +01:00
Côme Bernigaud 8acda9cad5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Patch from Rainer Jung to provide Solaris LDAP support

Conflicts:
	ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00
Anatol Belski ff724aadfb add NEWS entry 2015-08-18 17:20:51 +02:00
Xinchen Hui be58583ced Fixed bug #70288 (Apache crash related to ZEND_SEND_REF) 2015-08-18 17:19:37 +02:00
Côme Bernigaud 54bd91175d Merge branch 'pull-request/1477' into PHP-5.6
* pull-request/1477:
  Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 17:17:28 +02:00
Anatol Belski 1ef817d796 sync NEWS 2015-08-18 17:04:26 +02:00
Côme Bernigaud 40befb943c Patch from Rainer Jung to provide Solaris LDAP support 2015-08-18 16:52:44 +02:00
Xinchen Hui af8b6ac310 Merge branch 'patch-gdbinit' of https://github.com/adsr/php-src 2015-08-18 22:51:09 +08:00
Anatol Belski e39876bae2 bump versions 2015-08-18 16:06:04 +02:00
Anatol Belski 6fe551d086 Merge branch 'master' into PHP-7.0.0
* master: (211 commits)
  Fixed bug #70272 (Segfault in pdo_mysql)
  Improved fix for bug #70262
  It should not be skip
  Skip the test with valgrind
  Revert "Do not truncate exception traces upon anon class name"
  fix inheritance of internal interfaces with constants
  fix printzv (refcount)
  Do not truncate exception traces upon anon class name
  fix test
  TSRM_TLS should be usable in NTS build
  no need to skip this test if no dictionaries are installed
  new test for enchant pwl file
  Check and use correct signature_len type for EVP_VerifyFinal
  updated NEWS
  fixed changed error message in test
  updated NEWS
  Removed dead code
  Renamed struct member
  Fix #70277: new DateTimeZone($foo) is ignoring text after null byte
  Fixed bug #70262 (Accessing array crashes PHP 7.0beta3)
  ...
2015-08-18 16:00:17 +02:00
Xinchen Hui 3ea8c3cf1c Fixed memleak in Zend/tests/bug39297 2015-08-18 21:46:02 +08:00
Xinchen Hui e543769fa4 Fixed bug #70288 (Apache crash related to ZEND_SEND_REF) 2015-08-18 21:45:19 +08:00
Bob Weinand 34834c58fa Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1) 2015-08-18 15:01:24 +02:00
Julien Pauli 9a138b47c9 Removed unused code 2015-08-18 14:33:04 +02:00
Bob Weinand a1c9c318ea Woops, accidentally made TS build fail... 2015-08-18 14:04:48 +02:00
Bob Weinand 501407aa49 Revert fix for nicer truncation on log_errors_max_len 2015-08-18 14:01:18 +02:00
Christoph M. Becker 1b5e87a579 Fix #70289: Different sort in php7 (and hhvm) compared to php5
We add a respective note to UPGRADING. Furthermore, as renaming of zend_qsort()
and the new zend_insert_sort() are irrelevant for user-land, we move this
info to UPGRADING.INTERNALS.
2015-08-18 13:44:14 +02:00
Xinchen Hui 22eaa995ee Lost this entry while merging 2015-08-18 19:12:52 +08:00
Xinchen Hui 75198c7371 Merge branch 'master' of git.php.net:php-src 2015-08-18 19:07:26 +08:00
Bob Weinand c83cbdf6ce Better fix for exception traces truncation with anon classes 2015-08-18 12:48:06 +02:00
Xinchen Hui dca6d1027a Fixed bug #70272 (Segfault in pdo_mysql) 2015-08-18 18:33:07 +08:00
Xinchen Hui 8df3461086 Improved fix for bug #70262 2015-08-18 18:07:31 +08:00
Xinchen Hui cf9cdf97db Merge branch 'master' of git.php.net:php-src 2015-08-18 18:07:25 +08:00
Xinchen Hui 14ea398d78 It should not be skip 2015-08-18 18:04:26 +08:00
Xinchen Hui 685fee75a5 Skip the test with valgrind 2015-08-18 18:03:34 +08:00
Dmitry Stogov d9a9b8572b Revert "Do not truncate exception traces upon anon class name"
This reverts commit b0c77fb80c.
2015-08-18 12:03:04 +03:00
Michael Wallner 17fc5cc65d fix inheritance of internal interfaces with constants 2015-08-18 08:20:12 +02:00
Michael Wallner e6e5defb31 fix printzv (refcount) 2015-08-18 08:20:12 +02:00
Bob Weinand b0c77fb80c Do not truncate exception traces upon anon class name 2015-08-18 03:27:56 +02:00
Anatol Belski c042c64c43 fix test
This fail has nothing together with any changes in run-tests.php
Using run-tests.php from the 5.5 branch brings the same result. So
merely it is about how PHP7 handles and buffers errors.
2015-08-17 23:12:50 +02:00
Anatol Belski 94e272f1b3 TSRM_TLS should be usable in NTS build 2015-08-17 23:12:49 +02:00
Christoph M. Becker d28abb2da2 no need to skip this test if no dictionaries are installed 2015-08-17 21:43:28 +02:00
Christoph M. Becker c3a303d431 Merge branch 'pull-request/1473'
* pull-request/1473:
  new test for enchant pwl file
2015-08-17 21:42:42 +02:00
marcosptf 3b004baaaa new test for enchant pwl file 2015-08-17 21:28:37 +02:00
Jakub Zelenka c4a98e876c Check and use correct signature_len type for EVP_VerifyFinal 2015-08-17 18:43:02 +01:00
Christoph M. Becker b28758f253 updated NEWS 2015-08-17 19:35:10 +02:00
Christoph M. Becker 07c1b641b5 fixed changed error message in test 2015-08-17 19:33:49 +02:00
Christoph M. Becker 61591ea636 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70277: new DateTimeZone($foo) is ignoring text after null byte

Resolved conflicts:
	ext/date/php_date.c
2015-08-17 19:28:46 +02:00
Christoph M. Becker 3ed58fb5d7 updated NEWS 2015-08-17 17:27:13 +02:00
Julien Pauli aae9004ebd Removed dead code 2015-08-17 17:18:25 +02:00
Julien Pauli 5f54027d04 Renamed struct member
<resolv.h> has a #define for _res which makes compilation
 fail if included before php_output.h
2015-08-17 16:25:03 +02:00
Christoph M. Becker bb057498f7 Fix #70277: new DateTimeZone($foo) is ignoring text after null byte
The DateTimeZone constructors are not binary safe. They're parsing the timezone
as string, but discard the length when calling timezone_initialize(). This
patch adds a tz_len parameter and a respective check to timezone_initialize().
2015-08-17 15:58:37 +02:00
Dmitry Stogov ce89fd9758 Fixed bug #70262 (Accessing array crashes PHP 7.0beta3) 2015-08-17 12:58:14 +03:00
Dmitry Stogov 2d475eb943 Fixed tests on 32-bit systems 2015-08-17 12:54:33 +03:00
Stanislav Malyshev 1744be2d17 Fix for bug #69782 2015-08-16 17:16:15 -07:00
Derick Rethans 9a895396c9 Merge branch 'PHP-5.6' 2015-08-16 21:27:50 +01:00
Derick Rethans b010a9d846 Fixed sorting order
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
Derick Rethans cdaf057adb Updated to version 2015.6 (2015f) 2015-08-16 21:26:12 +01:00
Derick Rethans 8811847b24 Empty merge 2015-08-16 21:26:12 +01:00
Derick Rethans 7cafffc31f Updated to version 2015.6 (2015f) 2015-08-16 21:26:11 +01:00
Jakub Zelenka f3abea9f91 Fix some int overflows in openssl
There might be more. I just did a quick check for enc/dec, rand
and one BN call.
2015-08-16 15:43:00 +01:00
Anatol Belski 1613359543 update NEWS 2015-08-15 17:29:58 +02:00
Anatol Belski 46101dbec5 fix incompatible types
namely between hash_data_type and st_data_t
2015-08-15 12:03:47 +02:00
Anatol Belski 3689b44453 add SIZEOF_SIZE_T to oniguruma 2015-08-15 11:39:06 +02:00
Anatol Belski 228eaf5bc4 fix pointer truncation cases 2015-08-15 11:27:07 +02:00
Tjerk Meesters 0bd7d7a369 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS for #70157
  Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 16:49:30 +08:00
Tjerk Meesters b0c5439b5f Updated NEWS for #70157 2015-08-15 15:13:01 +08:00
Tjerk Meesters 71daca28d4 Merge branch 'bug70157' into PHP-5.6
* bug70157:
  Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:11:31 +08:00
Tjerk Meesters 0d7159d26d Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED 2015-08-15 15:10:34 +08:00
Christoph M. Becker c63b505573 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed wrong params in proto
2015-08-15 02:27:09 +02:00
Christoph M. Becker a4e0539188 fixed wrong params in proto 2015-08-15 02:23:56 +02:00
Adam Saponara d27a8a7dcb Prevent warning when printing arrays in gdb 2015-08-14 14:22:55 -04:00
Christoph M. Becker 243b9f6592 Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Executed file can be NULL
2015-08-14 17:21:09 +02:00
Christoph M. Becker e13de24101 updated NEWS 2015-08-14 17:19:29 +02:00
Christoph M. Becker fc444896af Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70264: CLI server directory traversal
2015-08-14 17:18:35 +02:00
Nikita Popov 6366679906 Executed file can be NULL
So revert this part to what it was originally.
2015-08-14 17:16:45 +02:00
Christoph M. Becker 23d0b93893 updated NEWS 2015-08-14 17:11:33 +02:00
Christoph M. Becker 9c805a6cb3 Fix #70264: CLI server directory traversal
On Windows the built-in webserver doesn't prevent directory traversal when
backslashes are used as path component separators. Even though that is not a
security issue (the CLI webserver is meant for testing only), we fix that by
replacing backslashes in the path with slashes on Windows, because backslashes
may be valid characters for file names on other systems, but not on Windows.
2015-08-14 17:05:31 +02:00
Nikita Popov 2af19fb50a Fix leak in previous commit
Turns out zend_update_property_str already does the copy implicitly.
2015-08-14 17:04:33 +02:00
Nikita Popov 13567d5dee Don't copy zend_strings during exception creation
Minor optimization...
2015-08-14 16:16:27 +02:00
Anatol Belski 38c19d43c1 fix array size calculation for range, related to bug #70239 2015-08-14 14:34:48 +02:00
Anatol Belski 86984d7ade add range() tests 2015-08-14 14:34:48 +02:00
Anatol Belski 01ee09f3f7 Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault 2015-08-14 14:34:47 +02:00
Christoph M. Becker ad27aded5c updated NEWS 2015-08-14 14:32:56 +02:00
Christoph M. Becker 5e93fe3c57 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
2015-08-14 14:25:19 +02:00
Christoph M. Becker 0e51f9798c updated NEWS 2015-08-14 14:20:37 +02:00
Christoph M. Becker e66bf11638 Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
2015-08-14 14:19:12 +02:00
Xinchen Hui a094f4faed Remove useless insert 2015-08-14 17:09:27 +08:00
Xinchen Hui 97433d8f6e Fixed dumpbt 2015-08-14 16:20:53 +08:00
Dmitry Stogov 57a8620761 Set expectations 2015-08-14 10:59:39 +03:00
Adam Harvey d6db83816c We don't need CVS/SVN keywords in UPGRADING. 2015-08-13 12:40:46 -07:00
Adam Harvey edafed6b68 We did eventually decide it was PHP 7.0, so make it so. 2015-08-13 12:39:41 -07:00
Christoph M. Becker f9744a36a2 Merge branch 'pull-request/1454'
* pull-request/1454:
  Docs for find_tested.php
2015-08-13 20:33:59 +02:00
Xinchen Hui 66866fb838 Simplify the macro (HT_DATA_SIZE/HT_HASH_SIZE is not used outside Zend) 2015-08-13 23:38:39 +08:00
Xinchen Hui cf12da4f33 Fixed similar issues(segfault on OOM) 2015-08-13 23:02:51 +08:00
Xinchen Hui ded3a44cfd Fixed segfault while OOM in pack_to_hash 2015-08-13 22:42:18 +08:00
Xinchen Hui 69dbfa8e9f Fixed tests(I am not sure, these tests seems strange, anyway it passes
locally now)
2015-08-13 22:31:59 +08:00
Christoph M. Becker 896cb51499 updated NEWS 2015-08-13 14:30:05 +02:00
Christoph M. Becker 1ec40e84d4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70232: Incorrect bump-along behavior with \K and empty string match

Resolved conflicts:
	ext/pcre/php_pcre.c
2015-08-13 14:28:16 +02:00
Christoph M. Becker cd18ba117c updated NEWS 2015-08-13 14:21:17 +02:00
Christoph M. Becker b9f23c2152 Fix #70232: Incorrect bump-along behavior with \K and empty string match
To do global matching (/g), for every empty match we have to do a second match
with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape
sequence is involved. For this purpose libpcre 8.0 introduced the
PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall
back to the old (possibly buggy) behavior.
2015-08-13 14:20:04 +02:00
Dmitry Stogov 715d5d2855 Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
2015-08-13 13:56:29 +03:00
Derick Rethans e5813fedf8 Merge branch 'PHP-5.6' 2015-08-13 11:07:39 +01:00
Derick Rethans f94bcb1026 Of course, we support v2 in PHP 5.6 as well. 2015-08-13 11:07:16 +01:00
Derick Rethans 159bc6ecdc Updated to version 2015.6 (2015f) 2015-08-13 10:54:06 +01:00
Derick Rethans a49ddcff67 Empty merge 2015-08-13 10:54:05 +01:00
Derick Rethans 890204fa45 Updated to version 2015.6 (2015f) 2015-08-13 10:54:03 +01:00
Derick Rethans 3ddd826684 Tell timelib we support v2 2015-08-13 10:50:28 +01:00
Xinchen Hui 18f2505830 Add entry for zend_memnstr change 2015-08-13 13:39:31 +08:00
Xinchen Hui 793d8dcffd Merge branch 'master' of git.php.net:php-src 2015-08-13 13:30:50 +08:00
Xinchen Hui dc5c6ab774 Fixed bug #70250 (extract() turns array elements to references) 2015-08-13 13:30:25 +08:00
Christopher Jones 4672aac0a7 Merge branch 'PHP-5.6' 2015-08-13 15:01:24 +10:00
Christopher Jones 5cfbfbc73c PDO_OCI is not experimental 2015-08-13 15:01:01 +10:00
Xinchen Hui adf0e49912 zend_hash_resize seems useless, use zend_hash_extend 2015-08-13 12:19:35 +08:00
Xinchen Hui a089ce0cc6 Fixed bug #70258 and #70253 2015-08-13 12:08:57 +08:00
Xinchen Hui e17b1266db Revert "Updated to version 2015.6 (2015f)"
This reverts commit 7b476a600b.
2015-08-13 11:55:30 +08:00
Derick Rethans 7b476a600b Updated to version 2015.6 (2015f) 2015-08-12 22:00:15 +01:00
Derick Rethans a869e800ec Empty merge 2015-08-12 22:00:15 +01:00
Derick Rethans a1c06f10dd Updated to version 2015.6 (2015f) 2015-08-12 22:00:13 +01:00
Christoph M. Becker f1dacee467 updated NEWS 2015-08-12 19:03:35 +02:00
Christoph M. Becker 3b874086e2 Fix #70245: strtotime does not emit warning when 2nd parameter is object or string
Caused by a refactoring strtotime() called
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ...) instead of
zend_parse_parameters().
2015-08-12 19:01:04 +02:00
Anatol Belski 2366a070c8 improve condition
same as CSPRNG, break by EOF
2015-08-12 14:50:43 +02:00
Christopher Jones b7031ba743 Further PHP 7 compat for OCI8 2015-08-12 21:57:16 +10:00
Bob Weinand c17afbc4f1 Fix valgrind false positives with watchpoints 2015-08-12 10:42:49 +00:00
Xinchen Hui 0f68f12d95 Use the same error msg with resize 2015-08-12 16:46:57 +08:00
Xinchen Hui d75228e201 We should not silently go on if the required size can not be met 2015-08-12 16:44:51 +08:00
Xinchen Hui 60b75eb9ed Revert "We should not silently go on if the required size can not be met."
This reverts commit d2bcdec980.
2015-08-12 16:44:18 +08:00
Xinchen Hui d2bcdec980 We should not silently go on if the required size can not be met. 2015-08-12 16:40:59 +08:00
Anatol Belski cbcacbb2da improve condition
read() == 0 is EOL
2015-08-12 10:20:26 +02:00
Anatol Belski 1a2c5bc180 second part fixing vc14, type/specifier order also in definitions 2015-08-12 08:52:08 +02:00
Xinchen Hui 121409865b use efree_size here 2015-08-12 11:15:09 +08:00
Dmitry Stogov fef086d113 Revert "Simplify ZEND_EXIT and count boolean values to it as exit status"
This reverts commit 7c003948c6.
2015-08-12 02:58:21 +03:00
Dmitry Stogov 9e290a44f1 Attempt to fix Windows build (vc14) 2015-08-12 02:47:37 +03:00
Bob Weinand 7c003948c6 Simplify ZEND_EXIT and count boolean values to it as exit status 2015-08-11 22:36:47 +02:00
Bob Weinand dbd8edbbd0 Fixed bug #70241 (Skipped assertions affect Generator returns) 2015-08-11 22:12:06 +02:00
Anatol Belski c173fef363 update NEWS 2015-08-11 17:37:36 +02:00
Anatol Belski 797e30f4fc Fixed bug #70198 Checking liveness does not work as expected 2015-08-11 17:36:10 +02:00
Anatol Belski 87db2e4a91 fix news entry 2015-08-11 16:52:13 +02:00
Anatol Belski 8708fe7835 updated NEWS 2015-08-11 16:50:53 +02:00
Anatol Belski 80bc2133cd fix bug #69833 mcrypt fd caching not working 2015-08-11 16:49:28 +02:00
Xinchen Hui 79cd9a18b5 Fixed bug #70237 (Empty while and do-while segmentation fault with opcode on CLI enabled). 2015-08-11 21:01:56 +08:00
Christoph M. Becker 42ef2b500b updated NEWS wrt. bug #69487 2015-08-11 01:36:39 +02:00
Christoph M. Becker 48c71cd94b Fix #69487: SAPI may truncate POST data
If SG(request_info).request_body can't be completely written (e.g. due to a
full drive), only parts of the POST data will be available. This patch changes
this, so that SG(request_info).request_body will be reset in this case, and a
warning will be thrown.
2015-08-11 01:32:13 +02:00
Lior Kaplan 8bac087a79 Add CVE IDs asigned to #69085 (PHP 5.6.7) 2015-08-10 11:54:39 +03:00
Lior Kaplan eaf5beabf4 Align NEWS with 5.6.12 2015-08-10 11:52:23 +03:00
Lior Kaplan c1127c4de3 Add entries for phar bug fixes in 5.6.11 (also have CVE assigned) 2015-08-10 11:49:18 +03:00
Lior Kaplan 9ff3334397 Add CVE IDs asigned (post release) to PHP 5.4.43 2015-08-10 11:19:18 +03:00
Lior Kaplan dc72378ff0 Add CVE IDs asigned to #69085 (PHP 5.4.39) 2015-08-10 11:18:33 +03:00
Christoph M. Becker 36cbb7cc4c updated NEWS 2015-08-09 02:43:41 +02:00
wusuopu 72976e2497 Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
The patch will store Content-Type header value in both HTTP_CONTENT_TYPE field and CONTENT_TYPE field.
2015-08-09 02:37:16 +02:00
Christoph M. Becker 1b4a80332c added tests for bug #66606 2015-08-09 02:36:58 +02:00
Ferenc Kovacs 1797a716ed fix NEWS 2015-08-07 08:46:10 +02:00
Steven Hilder de5d4d7b42 Add test: unmangling private properties in anon class instances 2015-08-06 16:56:05 +00:00
Steven Hilder 7ecb761818 Allow property names from anonymous classes to be unmangled 2015-08-06 15:18:14 +00:00
Dmitry Stogov 90cb3bb7de Reduce memory usage by using bitsets instead of array of bytes. 2015-08-06 15:41:50 +03:00
Dmitry Stogov 6d681876ee Get rid of memcpy() in MAKE_NOP() 2015-08-06 15:40:40 +03:00
Ferenc Kovacs ba3eb81240 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix NEWS
2015-08-06 09:52:50 +02:00
Ferenc Kovacs 8974539f13 fix NEWS 2015-08-06 09:52:24 +02:00
Stanislav Malyshev 2eaf28367d fix 32-bit test 2015-08-05 12:04:26 -07:00
Anatol Belski 1da0bb248a next version in NEWS 2015-08-05 15:22:27 +02:00
Anatol Belski 6edf641c1d sync NEWS entries 2015-08-05 11:28:36 +02:00
Stanislav Malyshev 03b765173b Merge branch 'PHP-5.6'
* PHP-5.6:
  5.5.29 next
2015-08-05 00:01:10 -07:00
Stanislav Malyshev 362bbaa2dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.29 next

Conflicts:
	configure.in
	main/php_version.h
2015-08-05 00:00:54 -07:00
Stanislav Malyshev 15e9f4baf4 5.5.29 next 2015-08-04 23:59:55 -07:00
Stanislav Malyshev b221df5549 5.4.45 next 2015-08-04 23:56:15 -07:00
Stanislav Malyshev feeb2fba93 fix merge 2015-08-04 23:51:55 -07:00
Anatol Belski 1674bd9b15 sync NEWS 2015-08-05 06:56:40 +02:00
Anatol Belski 69168b4d0c Merge branch 'master' into PHP-7.0.0
* master: (24 commits)
  5.5.29 next
  fix merge
  fix test
  fix merge
  fix test
  virtual_file_ex uses emalloc in 5.6+
  __wakeup doesn't have to be final
  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
  Fixed bug #70098 (Real memory usage doesn't decrease)
  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
  ...
2015-08-05 06:15:16 +02:00
Stanislav Malyshev 6981bc32be fix test 2015-08-04 16:47:44 -07:00
Stanislav Malyshev 3e416bba90 fix merge 2015-08-04 16:46:53 -07:00
Stanislav Malyshev 21602ec219 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test

Conflicts:
	sapi/cli/tests/005.phpt
2015-08-04 16:46:38 -07:00
Stanislav Malyshev 54187fa4b9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2015-08-04 16:45:55 -07:00
Stanislav Malyshev 2425f88afd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test
2015-08-04 16:45:32 -07:00
Stanislav Malyshev da5321013c fix test 2015-08-04 16:45:20 -07:00
Stanislav Malyshev 7b6dd533ba Merge branch 'PHP-5.6'
* PHP-5.6:
  virtual_file_ex uses emalloc in 5.6+
2015-08-04 16:33:07 -07:00
Stanislav Malyshev eb7ba73079 virtual_file_ex uses emalloc in 5.6+ 2015-08-04 16:31:57 -07:00
Stanislav Malyshev 54daa5317f Merge branch 'PHP-5.6'
* PHP-5.6:
  __wakeup doesn't have to be final
2015-08-04 16:14:32 -07:00
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 568a35f84f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  __wakeup doesn't have to be final
2015-08-04 16:13:53 -07:00
Stanislav Malyshev f2f8ea9ac5 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  __wakeup doesn't have to be final
2015-08-04 16:13:43 -07:00
Stanislav Malyshev f1acac154a __wakeup doesn't have to be final 2015-08-04 16:13:26 -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 d52c485717 update NEWS 2015-08-04 15:22:59 -07:00
Nikhil Vimal 1e4742d5cd Docs for find_tested.php
Initial Pass, also fixing the extra space before the extract_tests function name to keep with standards.
2015-08-04 16:46:47 -05:00
Stanislav Malyshev 742c54aecf Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test
  update NEWS
2015-08-04 14:46:30 -07:00
Stanislav Malyshev 0a21b5d970 fix test 2015-08-04 14:46:19 -07:00
Stanislav Malyshev ee61c7175f update NEWS 2015-08-04 14:37:28 -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 51f9a00b47 Merge branch 'PHP-5.4' into PHP-5.4.44
* PHP-5.4:
  Fixed bug #69892
  Adjust Git-Rules
2015-08-04 14:04:24 -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 02f762f146 sync NEWS 2015-08-04 20:20:01 +02:00
Anatol Belski 738729274f set versions 2015-08-04 20:18:28 +02:00
Anatol Belski 72bbde5e78 Merge branch 'master' into PHP-7.0.0
* master:
  run credits script
2015-08-04 20:16:27 +02:00
Dmitry Stogov 668ecaa606 Fixed bug #70098 (Real memory usage doesn't decrease) 2015-08-04 18:21:05 +03:00
Anatol Belski ed8d16b173 run credits script 2015-08-04 16:30:53 +02:00
Anatol Belski 29f0493075 Merge branch 'master' into PHP-7.0.0
* master: (174 commits)
  Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt)
  Added NEWS entry
  Get rid of ZEND_FAST_CALL_UNBOUND
  Move most "finally" related code-generation from pass_two() to compiler.
  Try to fix finally issue
  Fix further leaks
  Fix valgrind errors in phpdbg
  Fix last invalid read Also revert debugging run-tests.php changes...
  Fix a few valgrind errors in phpdbg
  Fix breaking on HANDLE_EXCEPTION (opline_before_exception)
  Remove unneded space(s)
  Fixed tests (system dependent numbers are replaced with %d)
  Fixed test
  updated UPGRADING
  Give better credit in NEWS
  Fixed bug #70182 (Segfault in ZEND_ASSIGN_OP handlers)
  more info for UPGRADING.INTERNALS
  updated NEWS
  Fixed bug #70183 null pointer deref (segfault) in zend_eval_const_expr
  fix inconsistent dll linkage
  ...
2015-08-04 11:38:46 +02:00
Dmitry Stogov 5202ba5a3e Fixed possible access to uninitialized data (prevents valgrind issues in Zend/tests/bug70089.phpt) 2015-08-04 10:48:32 +03:00
Dmitry Stogov fdb0dd9fc4 Added NEWS entry 2015-08-04 09:55:54 +03:00
Dmitry Stogov 58596897e9 Get rid of ZEND_FAST_CALL_UNBOUND 2015-08-04 08:35:40 +03:00
Dmitry Stogov a16aa4c42c Move most "finally" related code-generation from pass_two() to compiler. 2015-08-04 07:42:28 +03:00
Nikita Popov 743801054d Try to fix finally issue 2015-08-04 07:42:28 +03: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
Bob Weinand d0ad621906 Fix further leaks 2015-08-04 01:22:04 +02:00
Bob Weinand d8fe645db4 Fix valgrind errors in phpdbg
Revert "We cannot safely assume that all op array will be refcount 0 after execution"
This reverts commit b6936adb58.

This change turns out to not have been a clever idea and was causing more weirdness than it helped...
2015-08-04 00:00:10 +02:00
Bob Weinand b20953118b Fix last invalid read
Also revert debugging run-tests.php changes...
2015-08-03 20:49:41 +02:00
Bob Weinand b5e16cebda Fix a few valgrind errors in phpdbg 2015-08-03 20:27:46 +02:00
Bob Weinand 34596a3ddd Fix breaking on HANDLE_EXCEPTION (opline_before_exception) 2015-08-03 17:15:40 +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 d28070870c Fixed tests (system dependent numbers are replaced with %d) 2015-08-03 09:53:13 +03:00
Dmitry Stogov 7bc6706b6d Fixed test 2015-08-03 09:11:38 +03:00
Christoph M. Becker b4bd31b7a0 updated UPGRADING
The ZipArchive::setCompressionIndex() and ::setCompressionName() methods
introduced with 3a55ea02 were missing.
2015-08-03 00:24:39 +02:00
Bob Weinand 55fd8fabd9 Give better credit in NEWS
Patch is actually exactly what he proposed, so...
2015-08-02 19:49:52 +02:00
Bob Weinand 9e246a73ef Fixed bug #70182 (Segfault in ZEND_ASSIGN_OP handlers) 2015-08-02 19:08:39 +02:00
Anatol Belski a7587135e3 more info for UPGRADING.INTERNALS 2015-08-02 17:49:06 +02:00
Anatol Belski 56d163075b updated NEWS 2015-08-02 16:53:11 +02:00
Hugh Davenport 2a1a8f9ea7 Fixed bug #70183 null pointer deref (segfault) in zend_eval_const_expr 2015-08-02 16:51:23 +02:00
Anatol Belski 8e528b2792 fix inconsistent dll linkage 2015-08-02 16:26:48 +02: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 f8903e80c7 updated NEWS 2015-08-02 09:30:00 +02:00
Anatol Belski ee2e169108 Fixed bug #69896 'asm' operand has impossible constraints
Given it's an issue with 32-bit gcc-4.8, asm is disabled for the
breaking parts.
2015-08-02 09:25:24 +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
Nikita Popov 7fc04937f5 Fixed bug #69892 2015-08-01 20:47:43 -07:00
Christoph M. Becker 9f395b9e76 Merge branch 'PHP-5.6' 2015-08-01 23:55:44 +02:00
Christoph M. Becker 8d31e463a0 fixed test 2015-08-01 23:52:35 +02:00
Bob Weinand 06ef2aeca9 Skip shebang line if present 2015-08-01 23:28:55 +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
Bob Weinand 2d6f0e4584 Fix bug #70179 ($this refcount issue) 2015-08-01 20:35:56 +02:00
Bob Weinand 351b4e8015 Optimize btree/find_closest a bit 2015-08-01 18:23:00 +02:00
Christoph M. Becker f7c2128702 Merge branch 'PHP-5.6' 2015-08-01 14:21:01 +02:00
Christoph M. Becker 12f099e7bc mentioned cURL file uploads in the "backward incompatible changes" section 2015-08-01 14:15:44 +02: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
Anatol Belski 3a66a23679 avoid unnecessary scoping 2015-07-31 19:09:37 +02:00
Anatol Belski 7be9e69eaf remove useless ifdefs
the most outer block already tell's it's ZTS code
2015-07-31 19:09:36 +02:00
Bob Weinand 624bedcadc Fix tests 2015-07-31 18:22:04 +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
Anatol Belski b6803c75d9 updated NEWS 2015-07-31 13:32:40 +02:00
Anatol Belski b604716fb6 Fixed bug #70108 sometimes empty $_SERVER['QUERY_STRING']
auto_globals_jit is the reason every thread needs a copy. Otherwise
every thread will operate on the master values which can't end good.
2015-07-31 13:32:39 +02:00
Bob Weinand 590c5a7e50 Remove debug instructions (...) 2015-07-31 13:23:45 +02:00
Ferenc Kovacs 35b61e4f4d pear 1.10.0dev2 2015-07-31 10:22:50 +02:00
Bob Weinand ac87657d42 Implicit return should be always on the last line of a function 2015-07-31 02:44:42 +02:00
Bob Weinand 36aa92a67d Do not mark automatic return 1; as executable 2015-07-31 02:26:28 +02:00
Bob Weinand 1da4ee25b8 Fix oplog trace with already freed closures 2015-07-31 02:06:03 +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 d00acdc312 update UPGRADING 2015-07-30 15:23:15 +08: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 ffa341de59 add macro to access globals as whole 2015-07-30 09:05:08 +02: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
Xinchen Hui 3eabf2bf19 "This" is C++ keyword 2015-07-30 11:30:34 +08:00
Bob Weinand ae1a4f47e6 Add NEWS entry 2015-07-29 21:00:43 +02:00
Anatol Belski 9249890acf fix wrong info 2015-07-29 19:30:36 +02:00
Bob Weinand d45d5271f7 Fix bug #70164 (__COMPILER_HALT_OFFSET__ under namespace is not defined) 2015-07-29 19:18:29 +02:00
Christoph M. Becker 8f7d816b0d updated UPGRADING 2015-07-29 18:28:18 +02: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 f6d196a38f document globals accesor macro and tls specifiers 2015-07-29 17:26:53 +02:00
Anatol Belski 859507c9af add one more thread storage specifier to allow external link 2015-07-29 17:26:52 +02:00
Anatol Belski c17289e59c fix thread safety 2015-07-29 17:26:51 +02:00
Anatol Belski db70a337ff fix thread safety and zeroing method 2015-07-29 17:26:50 +02:00
Christoph M. Becker 2aa9db5a22 updated NEWS 2015-07-29 17:04:09 +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 43cdfd9a82 add unified globals accessor macro 2015-07-29 10:36:29 +02:00
Anatol Belski 7104d88c35 fix thread safety 2015-07-29 10:36:28 +02:00
Anatol Belski 7d41afeee8 fix thread safety 2015-07-29 10:36:27 +02:00
Julien Pauli 577ffcb55e Merge branch 'PHP-5.6'
* PHP-5.6:
  Adjust Git-Rules
  5.4.44 next
2015-07-29 10:05:19 +02:00
Julien Pauli d7f354fa57 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Adjust Git-Rules
  5.4.44 next
2015-07-29 10:04:33 +02:00
Julien Pauli 66edc15875 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Adjust Git-Rules
  5.4.44 next

Conflicts:
	configure.in
	main/php_version.h
2015-07-29 10:04:08 +02:00
Julien Pauli 8f1baa6e1c Adjust Git-Rules 2015-07-29 10:02:39 +02:00
Anton Blanchard fd8fb17be8 Improve performance of PowerPC64 fast_long_add_function
Detecting overflow with the XER is slow, partially because we have to
clear it before use.

PHP already has a fast way of detecting overflow in its fallback
c implementation. Overflow only occurs if the signs of the two
operands are the same and the sign of the result is different.
Furthermore, leaving it in c allows gcc to schedule the instructions
better.

This is 9% faster on a POWER8 running a simple testcase:

<?php
        function testcase($count = 100000000) {
		$x = 1;
                for ($i = 0; $i < $count; $i++) {
                        $x = $x + 1;
                        $x = $x + 1;
                        $x = $x + 1;
                        $x = $x + 1;
                        $x = $x + 1;
                }
        }

        testcase();
?>
2015-07-29 09:22:38 +02:00
Remi Collet 32e9b744c0 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #69674 (SIGSEGV array.c:953)
2015-07-29 09:22:21 +02:00
Xinchen Hui 7d5fb7bbf3 Fixed bug #69674 (SIGSEGV array.c:953) 2015-07-29 10:46:12 +08:00
Anton Blanchard 4d578f28df Improve performance of PowerPC64 fast_long_increment_function
Detecting overflow with the XER is slow, partially because we have to
clear it before use.

gcc does a better job of detecting overflow of an increment or decrement
than we can with inline assembly. It knows that an increment will only
overflow if it is one less than the overflow value. This means we end
up with a simple compare/branch. Furthermore, leaving it in c allows gcc
to schedule the instructions better.

This is 6% faster on a POWER8 running a simple testcase:

<?php
        function testcase($count = 100000000) {
		$x = 1;
                for ($i = 0; $i < $count; $i++) {
                        $x++;
                        $x++;
                        $x++;
                        $x++;
                        $x++;
                }
        }

        testcase();
?>
2015-07-28 18:38:23 +02:00
Anton Blanchard 305199a131 Improve performance of PowerPC64 ZEND_SIGNED_MULTIPLY_LONG
Detecting overflow with the XER is slow, partially because we have to
clear it before use. We can do better by using a trick where we compare
the high 64 bits of the result with the low 64 bits shifted right
63 bits.

This is 7% faster on a POWER8 running a simple testcase:

<?php
        function testcase($count = 100000000) {
                for ($i = 0; $i < $count; $i++) {
                        $x = 1;
                        $x = $x * 2;
                        $x = $x * 2;
                        $x = $x * 2;
                        $x = $x * 2;
                }
        }

        testcase();
?>
2015-07-28 18:38:23 +02:00
Anatol Belski a581910a76 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #70002 TS issues with temporary dir handling
  update NEWS
  Fixed bug #69900 Too long timeout on pipes
2015-07-28 17:44:14 +02:00
Anatol Belski 9fdb8c2ccd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #70002 TS issues with temporary dir handling
2015-07-28 17:42:37 +02:00
Anatol Belski 54bf6352fe updated NEWS 2015-07-28 17:42:25 +02:00
Anatol Belski ce5c4500cd Fixed bug #70002 TS issues with temporary dir handling 2015-07-28 17:41:38 +02:00
Anatol Belski 5c98b9972f improve ZEND_TLS declaration even more and move it to the better place 2015-07-28 16:59:53 +02:00
Anatol Belski e6cbca77f5 use better name 2015-07-28 16:59:52 +02:00
Anatol Belski d051bff8b6 simplify declaration 2015-07-28 16:59:51 +02:00
Anatol Belski 0c08ba8be4 add ZEND_THREAD specifier 2015-07-28 16:59:50 +02:00
Anatol Belski 2ec51faece adjust storage class
It's more convenient do explicitly disable the external linking. Also
it's an improvement from the build access time perspective.
2015-07-28 16:59:49 +02:00
Julien Pauli a28115ccdb Fix for #70159 - Better magic constants substitution 2015-07-28 16:30:08 +02:00
Xinchen Hui 94e23b29a1 online test 2015-07-28 16:43:12 +08:00
Xinchen Hui 0bddc18619 Fixed bug #70156 (Segfault in zend_find_alias_name) 2015-07-28 16:39:58 +08:00
Anatol Belski 1647ee7ef0 update NEWS 2015-07-28 10:29:24 +02:00
Anatol Belski 20e765b841 Fixed bug #69900 Too long timeout on pipes 2015-07-28 10:28:45 +02:00
Xinchen Hui 5ac6b8bcc6 Always checks for exception before push call frame 2015-07-28 16:06:06 +08:00
Xinchen Hui 4e9674f1a3 Previously fix is not right 2015-07-28 14:54:53 +08:00
Xinchen Hui df23dd78a5 Revert "Attempt to fix bug35437.phpt fails"
This reverts commit 16d6dfddef.
2015-07-28 14:54:20 +08:00
Xinchen Hui ef04c5c584 Revert "re-generate zend_vm_execute.h"
This reverts commit 4b6d4a1214.
2015-07-28 14:54:12 +08:00
Xinchen Hui 4b6d4a1214 re-generate zend_vm_execute.h 2015-07-28 11:15:57 +08:00
Xinchen Hui 45ea83ba97 Merge branch 'master' of git.php.net:php-src 2015-07-28 11:07:24 +08:00
Xinchen Hui 16d6dfddef Attempt to fix bug35437.phpt fails 2015-07-28 11:06:52 +08:00
Bob Weinand 9a312687f0 Fix test execution result with opcache 2015-07-28 02:14:49 +02:00
Ferenc Kovacs f3ad61126d use https for fetching the pear installer 2015-07-28 01:47:29 +02:00
Christoph M. Becker 9aa47d914c updated NEWS 2015-07-28 01:12:25 +02:00
Christoph M. Becker 4e8f01cb6e Fix #36365: scandir duplicates file name at every 65535th file
Due to DIR.offset being declared as short we have an overflow. This patch
changes the field to int.
2015-07-28 01:04:55 +02:00
Bob Weinand 33a91f57e9 Set CG(zend_lineno) to beginning for final class errors/ops 2015-07-28 00:57:49 +02:00
Christoph M. Becker b6bcf9c51a Add support for regenerating phpdbg lexers and scanners on Windows 2015-07-28 00:26:55 +02:00
Bob Weinand c0e0f1414e Fix phpdbg stepping on CATCH with exception 2015-07-28 00:10:42 +02:00
Remi Collet 80edd40383 fix memleak 2015-07-27 16:57:38 +02:00
Bob Weinand 248ebf0df6 Fix: A buf == NULL on filehandle will segfault 2015-07-27 16:57:09 +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 0014b9eda6 UPGRADING 2015-07-27 15:26:31 +02:00
Remi Collet a70047ef30 NEWS 2015-07-27 15:24:06 +02:00
Remi Collet e811770a68 Fix #70112 RFE Allow dirname to go up various times 2015-07-27 15:23:04 +02:00
Bob Weinand 64f25adb6b Remove -Wunused-result warnings 2015-07-27 15:02:01 +02:00
Xinchen Hui b17ecc1e02 Hmm, not sure why this is missed while merged 2015-07-27 11:19:58 +08: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
Stanislav Malyshev e488690d95 Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) 2015-07-26 17:10:24 -07:00
Stanislav Malyshev c96d08b272 Fix bug #70081: check types for SOAP variables 2015-07-26 16:44:18 -07:00
Christoph M. Becker 6de470e0af fixed broken test 2015-07-26 23:40:48 +02:00
Christoph M. Becker e6f55339cc add new error constant PREG_JIT_STACKLIMIT_ERROR 2015-07-26 23:40:38 +02:00
Bob Weinand 70c6a6f624 Fix infinite lexer loop for :\ sequence in phpdbg 2015-07-26 22:57:30 +02:00
Ferenc Kovacs 4cf9011c62 Merge branch 'PHP-5.6'
* PHP-5.6:
  make the travis irc notification a oneliner
2015-07-26 22:07:07 +02:00
Ferenc Kovacs e4153e9144 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  make the travis irc notification a oneliner
2015-07-26 22:06:51 +02:00
Ferenc Kovacs daa0abaf77 make the travis irc notification a oneliner 2015-07-26 22:06:26 +02:00
Bob Weinand f5bef4058c Fix bug #70138 (difference between gcc and clang) 2015-07-26 21:49:18 +02:00
Bob Weinand 9e8fec1ef7 Fix leaks from bug #70138 2015-07-26 21:49:18 +02:00
Nikita Popov a717acd21a Fix RECV_VARIADIC literal compacting wrt cache slot 2015-07-26 21:22:31 +02:00
Anatol Belski 27c973a954 exclude the platform diff case from the test
Say the string is \377\000, basename will use mbrlen() to check whether
it's a start of a multibyte sequence. While on Linux it'll return -1 for
any char in the extended ASCII, on Windows it's returning 1. From what I
see the reason is that Windows doesn't implement UTF-8 in the CRT lib,
it's rather 16-bit Unicode or DBCS. Since extended ASCII is convertable
to Unicode directly - thus the behavior. On Linux however, it's a true
UTF-8 locale and implementation, for it \377\000 is invalid.

Maybe mbrlen needs an independent implementation for Windows supporting
UTF-8. For now I just split out this case so the most of the big basename
test doesn't fail on this one case.
2015-07-26 20:54:27 +02:00
Anatol Belski c18f5e1edd add NULL check 2015-07-26 20:54:26 +02:00
Christoph M. Becker d73287be18 Merge branch 'PHP-5.6'
* PHP-5.6:
  allow to skip slow tests
2015-07-26 17:35:23 +02:00
Christoph M. Becker 5be8872f44 allow to skip slow tests 2015-07-26 17:33:09 +02:00
Ferenc Kovacs cd37e7c90d use the new php7 compatible pear installer 2015-07-26 14:17:32 +02:00
Yasuo Ohgaki 62515a1dbb Fixed Bug #70092 pg_field_type() is too slow 2015-07-26 05:29:27 +09:00
Bob Weinand 66fd52939b Just always copy the buffer, that makes it much safer
At least compared to conditionally using the mmap()ped input
2015-07-25 19:50:31 +02:00
Bob Weinand cdde4c51e1 Remove old unused header file 2015-07-25 01:35:29 +02:00
Bob Weinand e960d3ed2c Fix memory leak with opcache 2015-07-25 01:08:57 +02:00
Bob Weinand b4c595dd82 Fix op_arrays with opcache 2015-07-25 00:31:05 +02:00
Bob Weinand cf85985935 Fix print of ZEND_CATCH 2015-07-24 23:40:18 +02:00
Anatol Belski 9bae11d170 Revert "avoid pointer truncation"
This reverts commit 5334d53499.
2015-07-24 22:30:46 +02:00
Bob Weinand 7ca85d8875 Fully fix typed generator returns 2015-07-24 22:04:05 +02:00
Anatol Belski fa4cd519e6 fix printf format 2015-07-24 21:51:30 +02:00
Anatol Belski 5334d53499 avoid pointer truncation 2015-07-24 21:51:29 +02:00
Anatol Belski 05496c7312 fix scope 2015-07-24 21:51:28 +02:00
Bob Weinand 2eb845d0fa Fix bug using not set temporary with typed generator returns 2015-07-24 20:31:18 +02:00
Anatol Belski 352bf686ce update libs_version.txt 2015-07-24 20:24:50 +02:00
Anatol Belski 06c71b4774 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_versions.txt
2015-07-24 20:24:12 +02:00
Anatol Belski e42a29bf81 updated libs_versions.txt 2015-07-24 20:23:07 +02:00
Bob Weinand f1698eedce Fix non-debug build 2015-07-24 17:51:46 +02:00
Bob Weinand 76b882f0fc Use relative paths in phpdbg_lexer.c 2015-07-24 17:33:45 +02:00
Bob Weinand 13525328ed Cleanup shutdown, enable proper memory leak displaying
phpdbg should not memory leak...
2015-07-24 17:17:26 +02:00
Anatol Belski bf1ecbfe16 fix libwebp namings 2015-07-24 17:06:29 +02:00
Xinchen Hui d44fc4a073 Merge branch 'master' of git.php.net:php-src 2015-07-24 16:13:07 +08:00
Xinchen Hui 0f1e87d9c1 Fixed bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION) 2015-07-24 15:49:36 +08:00
Christoph M. Becker 1dab25689a Merge branch 'PHP-5.6'
* PHP-5.6:
  added regression test for bug #55472, which has already been fixed as of PHP 5.5.0
2015-07-24 01:25:45 +02:00
Christoph M. Becker 05ccc1f2d4 added regression test for bug #55472, which has already been fixed as of PHP
5.5.0
2015-07-24 01:23:33 +02:00
Christoph M. Becker 50fd9d0c04 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #53854: Missing constants for compression type
2015-07-23 21:43:40 +02:00
Christoph M. Becker 1a7db40a1f Fix #53854: Missing constants for compression type
The constants have already been added long ago. This patch just adds a PHPT
which checks the recognition of the respective compression methods.
Unfortunately, I've not been able to assemble a zip with all compression
methods.
2015-07-23 21:36:14 +02:00
Christoph M. Becker 19761a4801 updated NEWS 2015-07-23 18:46:00 +02:00
Christoph M. Becker de3f60d536 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70052: getimagesize() fails for very large and very small WBMP

Conflicts:
	ext/standard/image.c
2015-07-23 18:40:54 +02:00
Christoph M. Becker 35e717e12e updated NEWS 2015-07-23 18:37:07 +02:00
Christoph M. Becker 87829c09a1 Fix #70052: getimagesize() fails for very large and very small WBMP
Very large WBMP (width or height greater than 2**31-1) cause an overflow and
circumvent the size limitation of 2048x2048 px. Very small WBMP (less than 12
bytes) cause a read error and are not recognized. This patch fixes both bugs.
2015-07-23 18:31:28 +02:00
Anatol Belski 084a6e43cd enable ext/gd to support libpng16 2015-07-23 16:10:07 +02:00
Bob Weinand 9005b24aed Fix build failure for non-osx *nixes 2015-07-23 14:55:13 +02:00
Bob Weinand 6704d8d421 Fix valgrind warning with sigaction 2015-07-23 14:26:50 +02:00
Bob Weinand b7e8f65972 Fix printf format issues on 32 bit 2015-07-23 14:23:42 +02:00
Anatol Belski e60bcaeb01 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix config.w32
  fix C99 compat
  Align CVE format for #69669
  Fix 69882 entry
2015-07-23 07:43:33 +02:00
Anatol Belski 91f985b2f9 fix config.w32 2015-07-23 07:39:25 +02:00
Anatol Belski 3d38db3576 fix C99 compat 2015-07-23 07:39:16 +02:00
Xinchen Hui add2b158e2 cleanup 2015-07-23 12:16:22 +08:00
Xinchen Hui c55c7ef0ec Make debug_val_dump and var_dump prints int and float the same 2015-07-23 12:14:34 +08:00
Xinchen Hui 3fe35ba80d Make IS_TMP_VAR and IS_VAR differentiable 2015-07-23 11:36:46 +08:00
Xinchen Hui 0a5bbbdc92 Merge branch 'master' of git.php.net:php-src 2015-07-23 11:18:50 +08:00
Xinchen Hui a123876b4e Fixed bug #70117 (Unexpected return type error) 2015-07-23 11:16:10 +08:00
Bob Weinand 686b9039a6 Fix phpdbg test failure and crash with opcache 2015-07-23 01:03:03 +02:00
Bob Weinand 531fa70ba8 Opcache is assuming that op_arrays without refcount are always efree()d
We maybe should search for some other way, because just not refcounting the op_array is rather a dirty hack.
If possible, we should change opcache and just expect op_array->refcount != NULL ... but I have not found a clean way yet.
2015-07-22 23:16:50 +02:00
Lior Kaplan 6aa44ac73a Align CVE format for #69669 2015-07-22 20:35:31 +03:00
Lior Kaplan 8560138274 Fix 69882 entry 2015-07-22 20:34:31 +03:00
Bob Weinand 3cc02533ae Add phpdbg_get_executable() (gets executable ops/lines) 2015-07-22 18:11:35 +02:00
Bob Weinand b6936adb58 We cannot safely assume that all op array will be refcount 0 after execution
Some extensions may want to analyze or re-run the op array later
2015-07-22 17:16:16 +02:00
Xinchen Hui 3e479ef424 Fixed bug #70111 (Segfault when a function uses both an explicit return type and an explicit cast) 2015-07-22 22:43:30 +08:00
Bob Weinand d6415ae473 Always lowercase function names for lookup in phpdbg -p 2015-07-22 15:33:44 +02:00
Bob Weinand 264bed40a7 Fix opcode tests which may generate FCALL instead of ICALL 2015-07-22 13:49:28 +02:00
Bob Weinand 0da4a3ec2c Add -e (ZEND_EXT_* generation) option to phpdbg 2015-07-22 13:46:06 +02:00
Nikita Popov cff6cbc01f Emit EXT_STMT for each statement
I'm excluding unticked statements for this (in 5.x they were included)
as this would just result in two consecutive EXT_STMTs.

Also add all class statements to unticked statements, these would
generate superfluous EXT_STMT/TICKS in the parent op_array.
2015-07-22 13:38:42 +02:00
Xinchen Hui f56b89b0af Fixed opcodes printing.
-p"function"
-p"class::"
-p"class::method"
2015-07-22 19:13:26 +08:00
Julien Pauli c274e2397d Merge branch 'PHP-5.6'
* PHP-5.6:
  5.6.13 now

Conflicts:
	configure.in
	main/php_version.h
2015-07-22 09:28:59 +02:00
Julien Pauli 3eee495570 5.6.13 now 2015-07-22 09:27:49 +02:00
Bob Weinand 348fc4d6fd $argv and $argc may be IS_INDIRECT 2015-07-22 00:22:39 +02:00
Bob Weinand 262d32634b Undefined values may lead to big allocation 2015-07-22 00:02:59 +02:00
Nikita Popov 7c661bd304 Remove FAST_CALL_FROM_CATCH
This was generated for a return from a try block with both a catch
and a finally. However at this point no exception can be active,
because it either didn't exist in the first place or was explicitly
discarded using DISCARD_EXCEPTION.
2015-07-21 21:13:34 +02:00
Bob Weinand 2141ab9be5 Fix bug #70106 (Inheritance by anonymous class) 2015-07-21 20:34:06 +02:00
Bob Weinand 81a2c43d5e Add an option to not generate INIT_FCALL ops for user functions too 2015-07-21 16:39:49 +02:00
Anatol Belski d1a026997a version up in NEWS 2015-07-21 16:37:43 +02:00
Anatol Belski 0b31192bc7 remove BOM from NEWS 2015-07-21 16:36:36 +02:00
Anatol Belski 0f60a746e4 fix merge mistake 2015-07-21 05:55:54 -07:00
Anatol Belski 735a7c6a56 one more test from ef1b588f6a 2015-07-21 05:52:12 -07:00
Anatol Belski 94e7c770ba readd test from 3bb70fe290 2015-07-21 05:51:09 -07:00
Anatol Belski 26abfc8bc9 readd commit 3bb70fe290 2015-07-21 05:49:36 -07:00
Anatol Belski ec4350e4c8 bump versions 2015-07-21 12:40:58 +02:00
Anatol Belski 3e971e7d5c sync NEWS 2015-07-21 12:34:30 +02:00
Anatol Belski b148ef4496 Merge branch 'master' into PHP-7.0.0
* master: (204 commits)
  Reverted ad4533fdba
  update UPGRADING
  updated NEWS
  fix comment
  libwebp support for linux
  Replaced libvpx by libwebp (first draft; Windows only)
  update news with bug #70022
  Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
  Add tests for json_last_error()/json_last_error_msg() failures
  updated NEWS
  updated NEWS
  Exclude opcache from a few opcode related tests
  updated NEWS
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Fix various Windows issues (e.g. dir separators)
  Remove bogus exception_save() from FETCH_CLASS
  Fix readline/libedit build
  Do not use readline when not having a tty This is important for e.g. run-tests.php
  Add show_unexecuted option to phpdbg_end_oplog()
  ...

Conflicts:
	Zend/tests/temporary_cleaning_001.phpt
	Zend/tests/temporary_cleaning_003.phpt
	Zend/tests/temporary_cleaning_004.phpt
	Zend/tests/temporary_cleaning_005.phpt
	Zend/zend_compile.c
	Zend/zend_compile.h
	sapi/phpdbg/phpdbg_opcode.c
2015-07-21 12:27:50 +02:00
Anatol Belski 6065b29fe4 Reverted ad4533fdba
The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.
2015-07-21 11:18:36 +02:00
Anatol Belski 1767992e4e update UPGRADING 2015-07-21 11:12:08 +02:00
Anatol Belski 00361072c6 updated NEWS 2015-07-21 10:42:06 +02:00
Anatol Belski af0f857c01 fix comment 2015-07-21 10:37:08 +02:00
Anatol Belski 4646e6e7d3 libwebp support for linux 2015-07-21 10:37:07 +02:00
Christoph M. Becker 00ba7e6215 Replaced libvpx by libwebp (first draft; Windows only)
ext/gd/libgd/gd_webp.c has been taken from libgd[1]. Mainly, gd_error(X) has
been subsituted by zend_error(E_ERROR, X) and BGD_DECLARE(X) by X. Further
modifications are obvious from the diff.

All GD tests are passing, what raises hope, but we need more WebP tests,
anyway.

[1] <https://github.com/libgd/libgd/blob/7ec030c4f1dae75ed5d82c3eed2abe6775742c75/src/gd_webp.c>
2015-07-21 10:37:06 +02:00
Anatol Belski 9b9448a54a update news with bug #70022 2015-07-21 09:22:45 +02:00
Yasuo Ohgaki ad4533fdba Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR. 2015-07-21 12:59:23 +09:00
Christoph M. Becker 22767a48a7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add tests for json_last_error()/json_last_error_msg() failures
2015-07-21 02:00:16 +02:00
Kubo2 f18ba0f9c9 Add tests for json_last_error()/json_last_error_msg() failures 2015-07-21 01:50:40 +02:00
Christoph M. Becker 0c651cf8c3 updated NEWS 2015-07-21 01:24:55 +02:00
Christoph M. Becker 16d6a93f09 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
2015-07-21 01:20:02 +02:00
Christoph M. Becker e3a85074ed updated NEWS 2015-07-21 01:17:51 +02:00
Christoph M. Becker f1228ebc61 Merge branch 'pull-request/1425' into PHP-5.6
* pull-request/1425:
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
2015-07-21 01:13:04 +02:00
Bob Weinand b8534daa31 Exclude opcache from a few opcode related tests 2015-07-21 00:06:34 +02:00
Christoph M. Becker 81a008563b updated NEWS 2015-07-20 23:50:40 +02:00
Christoph M. Becker ea37ca7707 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
2015-07-20 23:44:04 +02:00
Christoph M. Becker 8461a87454 updated NEWS 2015-07-20 23:40:23 +02:00
Christoph M. Becker e7f2356665 Fix #66387: Stack overflow with imagefilltoborder
The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.
2015-07-20 23:36:32 +02:00
Bob Weinand 80bb4fd45a Fix various Windows issues (e.g. dir separators) 2015-07-20 23:26:45 +02:00
Nikita Popov 94fb5391e7 Remove bogus exception_save() from FETCH_CLASS
There can't be no exception at the start of the op. Also would miss
the corresponding exception_restore().
2015-07-20 22:56:51 +02:00
Bob Weinand 7aa2be060c Fix readline/libedit build 2015-07-20 22:45:05 +02:00
Bob Weinand f0b50963e5 Do not use readline when not having a tty
This is important for e.g. run-tests.php
2015-07-20 21:57:00 +02:00
Bob Weinand 6aadeba213 Add show_unexecuted option to phpdbg_end_oplog() 2015-07-20 20:41:07 +02:00
Bob Weinand 378a05f0de Move phpdbg tests to .phpt mechanism
Also add a few more in-depth tests related to $argv, breakpoints and uncaught exceptions
2015-07-20 18:00:43 +02:00
Bob Weinand 75a3de0cd8 Fix misbehaviors with uncaught exceptions and finally or eval 2015-07-20 18:00:43 +02:00
Bob Weinand 4dc0546a59 Preserve argv consistency over multiple runs 2015-07-20 18:00:43 +02:00
Bob Weinand acba295088 Fix info vars with refs/indirects 2015-07-20 18:00:43 +02:00
Bob Weinand 22c7c1189a Fix function/method breakpoint case sensitivity issues 2015-07-20 18:00:43 +02:00
Bob Weinand 50e76d951e Always only halt upon first non-recv opcode in a function 2015-07-20 18:00:42 +02:00
Bob Weinand 1f9bba68a9 Make opcode breakpoints work again 2015-07-20 18:00:42 +02:00
Bob Weinand e3cd0709db Do never clean stdin buffer away 2015-07-20 18:00:42 +02:00
Bob Weinand dee629c92d Fix use of already freed hashtable (wrong variable) 2015-07-20 18:00:42 +02:00
Bob Weinand 699e641e93 Do not show "Script ended normally" upon forced rerun 2015-07-20 18:00:42 +02:00
Bob Weinand 6435eb8019 Do not display compilation success / normal script end in -rr mode 2015-07-20 18:00:42 +02:00
Christoph M. Becker 2ec8611293 revised bug53156.phpt 2015-07-20 03:05:22 +02:00
Christoph M. Becker 72b73e24a0 Fix #53156: imagerectangle problem with point ordering
Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.
2015-07-20 02:14:29 +02:00
Christoph M. Becker 440d715632 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added basic test for imagewebp() and imagecreatefromwebp()
2015-07-19 23:11:11 +02:00
Christoph M. Becker 90de2aeaac Added basic test for imagewebp() and imagecreatefromwebp() 2015-07-19 23:05:07 +02:00
Christoph M. Becker 3002ba468c updated NEWS 2015-07-19 22:44:53 +02:00
Christoph M. Becker 6c8dbfd5c1 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #70102: imagecreatefromwebm() shifts colors
2015-07-19 22:40:49 +02:00
Christoph M. Becker 4b2d025937 updated NEWS 2015-07-19 22:39:18 +02:00
Christoph M. Becker a31fe58d80 Fix #70102: imagecreatefromwebm() shifts colors
libgd internally uses ARGB format, so we have to decode to ARGB instead of
RGBA.
2015-07-19 22:33:54 +02:00
Christoph M. Becker 209223b97e Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed Fix #66590, which may segfault
2015-07-19 22:01:20 +02:00
Christoph M. Becker d3958b32ca fixed Fix #66590, which may segfault 2015-07-19 21:54:55 +02:00
Anatol Belski 3de0ae5477 fix two clang errors on Windows 2015-07-19 20:06:31 +02:00
Anatol Belski 61ebc6c615 exclude a non windows test 2015-07-19 19:53:53 +02:00
Christoph M. Becker 0ea35e1732 updated NEWS 2015-07-19 17:48:02 +02:00
Christoph M. Becker f9d95a4003 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #66590: imagewebp() doesn't pad to even length
2015-07-19 17:45:16 +02:00
Christoph M. Becker 9e08c990ac updated NEWS 2015-07-19 17:43:44 +02:00
Christoph M. Becker 96e42403d5 Fix #66590: imagewebp() doesn't pad to even length
The code in the bundled libgd uses libvpx and writes the riff manually. The
code generates the correct even size, but neglects the padding. It's possible
older versions of libwebp would decode this, but libwebp 0.4.0 does not.

Let's apply the patch supplied by one of the WebP developers.
2015-07-19 17:38:04 +02:00
Rasmus Lerdorf 3760cb6a59 wddx_add_vars() returns a bool 2015-07-19 07:05:03 -07:00
Christoph M. Becker 1e29edada7 updated NEWS 2015-07-18 22:57:02 +02:00
Christoph M. Becker 3ed0d18152 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
	ext/standard/iptc.c
2015-07-18 22:52:39 +02:00
Christoph M. Becker abc3598f47 updated NEWS 2015-07-18 22:50:11 +02:00
Christoph M. Becker 8c483ce36c Fix #70096: Repeated iptcembed() adds superfluous FF bytes
When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.
2015-07-18 22:48:54 +02:00
Nikita Popov f809f28119 Check mbfl_filt_put_invalid_char return value
And fix some libmbfl warnings
2015-07-18 21:53:03 +02:00
Nikita Popov 4ac0d96faa Deduplicate usort code 2015-07-18 21:53:03 +02:00
Christoph M. Becker 77140d8b3d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed PHPT that is always being skipped or otherwise would fail
2015-07-18 21:35:54 +02:00
Christoph M. Becker a66efb0b15 fixed PHPT that is always being skipped or otherwise would fail 2015-07-18 21:33:20 +02:00
Nikita Popov df031961ad Correctly handle zend_hash_sort failure
This can't actually happen right now, but should it become possible
we won't be leaking everything anymore.
2015-07-18 20:07:00 +02:00
Nikita Popov 179c8a2a09 Fix usort modification detection
This would delref the wrong array, leading to a segfault.
2015-07-18 20:07:00 +02:00
Jakub Zelenka 4540e644ec Regenerate bison and re2c files in json 2015-07-18 17:41:17 +01:00
Nikita Popov 4854b11566 Partially fix XSLT warnings
The two remaining issues seem to be genuine problems. We're treating
node->children as a string, even though it's actually an xmlNode.
The same code exists twice in xpath.c. In all cases gcov shows no
coverage for it.
2015-07-17 21:12:15 +02:00
Nikita Popov 42e32c33e2 More warning fixes 2015-07-17 21:12:15 +02:00
Nikita Popov 36e49c702b Fix simplexml warnings 2015-07-17 21:12:15 +02:00
Anatol Belski a685953969 fix duplicated line 2015-07-17 20:30:21 +02:00
Nikita Popov 5c95226d50 Various warning fixes 2015-07-17 20:18:25 +02:00
Nikita Popov 90d9adccec Fix zlib_filter warnings 2015-07-17 19:48:06 +02:00
Nikita Popov 981c618749 Remove --with-t1lib from travis build 2015-07-17 19:08:08 +02:00
Nikita Popov 0284755d97 Always use libtool --silent
We don't need this spam for debug builds. Now make --quiet does
something useful for debug builds as well.
2015-07-17 19:03:56 +02:00
Nikita Popov 8a9eee8f7e Fix mysqlnd warnings 2015-07-17 17:48:02 +02:00
Nikita Popov 0039a3e96f Fixed signed/unsigned warnings in wddx
Also added extra const annotation to zend_memnstr.
2015-07-17 17:19:23 +02:00
Nikita Popov e97cb1427f Remove dead goto label in phpdbg_cmd.c 2015-07-17 16:53:07 +02:00
Nikita Popov 20e5027293 Switch asprintf to spprintf in phpdbg opcode dump
Also use %td where appropriate, a lot of the values are ptrdiff
based.

Fix a leak in phpdbg_frame.c.
2015-07-17 16:53:07 +02:00
Nikita Popov 75dc4486b2 Make s(tr)pprintf infallible
spprintf now always creates a buffer and strpprintf always returns
a zend_string. Previously, if the result of the format happened to
be empty, the spprintf buffer would be set to NULL and strpprintf
would return NULL.
2015-07-17 16:53:06 +02:00
Anatol Belski daba578dbe fix file cache path calculation at all the places
moved the corresponding code into a separte function while on that
2015-07-17 15:14:25 +02:00
Anatol Belski 4c87750c26 fix path handling for the file cache 2015-07-17 13:51:16 +02:00
Xinchen Hui 2c048afd3b Donot use one_char_string 2015-07-17 16:09:11 +08:00
Xinchen Hui 91e5b30a3b Merge branch 'master' of git.php.net:php-src 2015-07-17 15:56:28 +08:00
Xinchen Hui 7d07afd6c1 Fixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ()) 2015-07-17 15:55:34 +08:00
Nikita Popov c568ffe517 Ignore getcwd return in zend_compile
To do this move the php_ignore_value macro to ZEND_IGNORE_VALUE.
2015-07-16 22:48:56 +02:00
Nikita Popov 208257eec5 Explicitly ignore mblen(NULL, 0) retval 2015-07-16 22:39:11 +02:00
nikita2206 d8a6130660 Handle empty (NULL) stmt in ast_export 2015-07-16 22:31:36 +02:00
Bob Weinand 9ee52ca3ae Merge remote-tracking branch 'origin/PHP-5.6' 2015-07-16 19:12:38 +02:00
Anatol Belski 0dce8373cd forked test for windows 2015-07-16 15:05:04 +02:00
Xinchen Hui deeb6379cb Fixed bug #70079 (Segmentation fault after more than 100 SoapClient calls) 2015-07-16 18:32:42 +08:00
Bob Weinand c13124cc0f Cleanup exception displaying code in phpdbg 2015-07-16 10:28:59 +02:00
Bob Weinand 37e03f6b32 Fix test; this should properly emit a fatal error, just as every other by-ref assignment to an overloaded object 2015-07-16 09:29:43 +02:00
Bob Weinand 0242653377 Fix test; this should properly throw an Error, just as every other by-ref assignment to an overloaded object 2015-07-16 09:25:19 +02:00
Christopher Jones e6d9061e85 More OCI8 diff fixes (Rajendra) 2015-07-16 13:06:35 +10:00
Bob Weinand f57cb13c56 Backport fix for bug #70083 to PHP-5.6 2015-07-15 22:46:53 +02:00
Bob Weinand 0af0733352 Fixed bug #70083 (Use after free with assign by ref on overloaded objects) 2015-07-15 22:36:42 +02:00
Bob Weinand d25f3819c7 Fix crash on non-debug for phpdbg_end_oplog() 2015-07-15 22:30:12 +02:00
Rasmus Lerdorf 73773c2175 unserialize() takes a 2nd optional arg and it can't be a bool 2015-07-15 09:59:31 -07:00
Bob Weinand af0d6256d5 Fix [valid] valgrind warnings, add first watchpoints test 2015-07-15 14:22:51 +00:00
Dmitry Stogov a658465ef2 Export argument type checking functions 2015-08-11 19:11:21 +03:00
Anatol Belski 5b017ba8be Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  Fixed bug #70198 Checking liveness does not work as expected
2015-08-11 17:38:34 +02:00
Anatol Belski c1de584e3f update NEWS 2015-08-11 17:09:31 +02:00
Anatol Belski 8d6373b7ea updated NEWS 2015-08-11 16:55:04 +02:00
Anatol Belski f61b01efa2 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix news entry
  updated NEWS
  fix bug #69833 mcrypt fd caching not working
2015-08-11 16:54:27 +02:00
Xinchen Hui 9834cd9339 Revert "Revert "suggest parentheses around ‘&&’ within ‘||’""
This reverts commit ec1e8929c4.
2015-08-11 22:34:39 +08:00
Xinchen Hui 5a640d8aed Merge branch 'master' of git.php.net:php-src
Conflicts:
	ext/standard/tests/streams/bug70198.phpt
2015-08-11 22:31:47 +08:00
Anatol Belski 6608821a87 make this test more robust on slower execution 2015-08-11 16:30:14 +02:00
Xinchen Hui faa3c9d291 Fixed the test, and make it faster while failingt 2015-08-11 22:30:02 +08:00
Xinchen Hui ec1e8929c4 Revert "suggest parentheses around ‘&&’ within ‘||’"
This reverts commit 4f2c0e0451.
2015-08-11 22:14:37 +08:00
Xinchen Hui b997130a34 Update NEWS 2015-08-11 21:44:47 +08:00
Xinchen Hui 6e894f8b81 Merge branch 'PHP-5.6' 2015-08-11 21:44:04 +08:00
Xinchen Hui 4f2c0e0451 suggest parentheses around ‘&&’ within ‘||’ 2015-08-11 21:43:38 +08:00
Xinchen Hui 4064ee3061 Fixed bug #70240 (Segfault when doing unset($var());) 2015-08-11 21:42:11 +08:00
Dmitry Stogov 162bf9e802 Reimplemented ability to get debug info (C source file and line number) in phpdbg without hacks and ABI breaks. 2015-08-11 16:33:47 +03:00
Anatol Belski 7eb6bd1311 add EAGAIN checks
EAGAIN and EWOULDBLOCK should be checked together and don't necessary,
have same value. So checking both is better for portability.
2015-08-11 15:17:25 +02:00
Anatol Belski 8d2b131d9f add test for bug #70198 2015-08-11 15:00:17 +02:00
Anatol Belski 24f0fe6b1f Fixed bug #70198 Checking liveness does not work as expected 2015-08-11 14:40:34 +02:00
Anatol Belski b0893344df integrate static tsrmls cache with ext/mcrypt 2015-08-11 12:32:00 +02:00
Anatol Belski f15ec180ad add folds 2015-08-11 12:11:24 +02:00
Xinchen Hui 275dd5d8ec Merge branch 'marcosptf-enchant-phpt' of https://github.com/marcosptf/php-src 2015-08-11 11:13:01 +08:00
Christoph M. Becker 9f37f5f344 updated NEWS wrt. bug #69487 2015-08-11 01:43:40 +02:00
Christoph M. Becker 37707b2dd6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #69487: SAPI may truncate POST data
2015-08-11 01:42:25 +02:00
Christoph M. Becker 913fc54e0f Merge branch 'PHP-5.6'
* PHP-5.6:
  Add CVE IDs asigned to #69085 (PHP 5.6.7)
  Align NEWS with 5.6.12
  Add entries for phar bug fixes in 5.6.11 (also have CVE assigned)
2015-08-11 01:23:18 +02:00
Andrea Faulds 8394713e5d Replace bug70018 test (broken on non-GNU) with win32 version 2015-08-11 00:23:24 +02:00
Dmitry Stogov bdada12dae Reverted useless cleanup code 2015-08-10 23:55:37 +03:00
marcosptf 20448abc65 Update broker_describe.phpt 2015-08-10 15:54:22 -03:00
marcosptf 6222e5f196 Update broker_describe.phpt 2015-08-10 14:50:32 -03:00
marcosptf 5dc3dadf71 Update dict_check.phpt 2015-08-10 14:14:13 -03:00
Dmitry Stogov 97f159d702 Support for XLC compiler 2015-08-10 19:12:11 +03:00
Xinchen Hui 4b90d63b57 Merge branch 'master' of git.php.net:php-src 2015-08-10 23:25:02 +08:00
Anatol Belski d632eff9c0 fix test 2015-08-10 17:20:23 +02:00
Xinchen Hui bf6d8d5188 Merge branch 'master' of git.php.net:php-src 2015-08-10 23:00:27 +08:00
Xinchen Hui 89940993f0 Fixed Bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc) 2015-08-10 22:58:58 +08:00
Dmitry Stogov adcb1102e7 Fixed typo 2015-08-10 17:57:49 +03:00
Xinchen Hui 644bb2f654 Merge branch 'copy-32bit-be' of https://github.com/cmb69/php-src 2015-08-10 22:54:47 +08:00
Bob Weinand cdc0dd4826 Merge branch 'ts_bin_hex_conv' of https://github.com/bwoebi/php-src 2015-08-10 16:16:59 +02:00
Xinchen Hui b6dc6c254f Merge branch 'master' of git.php.net:php-src 2015-08-10 22:03:33 +08:00
Xinchen Hui 55a017c303 Add XFAIL test for #70228 2015-08-10 22:02:15 +08:00
Xinchen Hui 87a5f2c486 Fixed no return statement in function returning non-void 2015-08-10 21:48:17 +08:00
Dmitry Stogov 18fb424bef Fixed bug #70207 (Finally is broken with opcache) 2015-08-10 16:38:43 +03:00
Xinchen Hui aaf7638706 Fixed bug #70221 (persistent sqlite connection + custom function segfaults) 2015-08-10 19:00:35 +08:00
Xinchen Hui 16f2ce8537 Hmm, we should also take care of uninitialized hashTable 2015-08-10 17:58:24 +08:00
Xinchen Hui aa546256e3 Fixed bug #70223 (Incrementing value returned by magic getter) 2015-08-10 17:12:45 +08:00
Xinchen Hui 73a69c9c03 Fixed typo 2015-08-10 17:06:17 +08:00
Xinchen Hui 1bf20a18cf Merge branch 'master' of git.php.net:php-src 2015-08-10 17:03:36 +08:00
Xinchen Hui be54eb7db1 Fixed bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free) 2015-08-10 17:02:16 +08:00
Anatol Belski a88edb3bed fix wording 2015-08-10 10:43:53 +02:00
Anatol Belski 0f8bc1cec9 one bracket too much 2015-08-10 10:42:10 +02:00
Anatol Belski e7e646b0e5 add check for required re2c
>=0.13.5 is required for php-7.0.0
2015-08-10 10:40:14 +02:00
Anatol Belski f318bffec3 catch up with the current requirement
bison 3.0.2 is used for php-7.0.0
2015-08-10 10:34:26 +02:00
Anatol Belski df71933bd2 make use of PHPROOT for possible mkdist integration 2015-08-10 09:57:05 +02:00
Anatol Belski c0b3665f37 make scripts/dev/gen_verify_stub executable 2015-08-10 09:50:54 +02:00
Anatol Belski 7600f5246c initial add verification stub generator 2015-08-10 09:48:28 +02:00
Anatol Belski a91065c63c don't close stdin 2015-08-09 18:54:20 +02:00
Anatol Belski a94ea9c97a fix the mcrypt related part of bug #64833 2015-08-09 18:40:29 +02:00
Christoph M. Becker 79f64e5e67 Fix #70173: ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc
On 32bit big endian architectures the high word of a zend_value is copied
twice, instead of copying both words. Let's fix it.
2015-08-09 15:01:37 +02:00
marcosptf 3c41ab9ce9 Update broker_free.phpt 2015-08-09 08:15:33 -03:00
marcosptf 32fb77952f Update broker_dict_exists.phpt 2015-08-09 08:14:56 -03:00
marcosptf d3cd2f8221 Update broker_describe.phpt 2015-08-09 08:14:19 -03:00
marcosptf b7c5afbe99 Update dict_suggest.phpt 2015-08-09 08:13:12 -03:00
marcosptf 10ad115518 Update dict_store_replacement.phpt 2015-08-09 08:11:32 -03:00
marcosptf 49510ef7aa Update dict_quick_check_01.phpt 2015-08-09 08:09:13 -03:00
marcosptf 63990ab18a Update dict_quick_check.phpt 2015-08-09 08:06:48 -03:00
marcosptf ec24053797 Update dict_is_in_session.phpt 2015-08-09 08:04:49 -03:00
marcosptf fe497170bd Update dict_get_error.phpt 2015-08-09 08:02:05 -03:00
marcosptf ef3e2d7beb Update dict_describe.phpt 2015-08-09 07:58:58 -03:00
marcosptf 4129b50d23 Update dict_check.phpt 2015-08-09 07:56:23 -03:00
marcosptf 1cb530058e Update dict_add_to_session.phpt 2015-08-09 07:54:44 -03:00
marcosptf a7b9e3172d Update dict_add_to_personal.phpt 2015-08-09 07:52:04 -03:00
marcosptf c2bc106608 Update broker_set_ordering.phpt 2015-08-09 07:48:51 -03:00
marcosptf 018c412b5c Update broker_request_dict_01.phpt 2015-08-09 07:45:06 -03:00
marcosptf 4848b6af6b Update broker_request_dict_01.phpt 2015-08-09 07:44:04 -03:00
marcosptf b8fdc02536 Update broker_request_dict.phpt 2015-08-09 07:43:02 -03:00
marcosptf 9d3818c4cb Update broker_list_dicts.phpt 2015-08-09 07:37:50 -03:00
marcosptf 58c77c3610 Update broker_init.phpt 2015-08-09 07:35:59 -03:00
marcosptf 4191709915 Update broker_get_error.phpt 2015-08-09 07:31:56 -03:00
marcosptf c9857071d4 Update broker_free_01.phpt 2015-08-09 07:29:50 -03:00
marcosptf 8fa0ef538e Update broker_free.phpt 2015-08-09 07:28:17 -03:00
marcosptf 158aca848a new test refactor 2015-08-09 07:23:07 -03:00
marcosptf 55f9427688 test refactor
refactor of this test did ten years ago, make it more resilient.
2015-08-09 07:17:30 -03:00
Anatol Belski 06a19cf218 fix typo in NEWS 2015-08-09 10:40:07 +02:00
Christoph M. Becker 64a5189358 updated NEWS 2015-08-09 02:59:15 +02:00
Christoph M. Becker fc69549593 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
  added tests for bug #66606
2015-08-09 02:51:16 +02:00
Bob Weinand cab75d8b00 Fixed bug #70215 (segfault when __invoke is static) 2015-08-08 16:19:12 +02:00
Bob Weinand 0c60524190 Fixed bug #70214 (FASYNC possibly not defined) 2015-08-08 15:53:27 +02:00
Bob Weinand b7aac1f5f2 Fixed bug #70208 (Assert breaking access on objects) 2015-08-08 00:02:49 +02:00
marcosptf d2632efe5e Update broker_list_dicts.phpt 2015-08-07 15:16:31 -03:00
marcosptf e36431fbee Update dict_suggest.phpt 2015-08-07 15:14:22 -03:00
Lior Kaplan cc53406747 Add FR to #70112 news entry 2015-08-07 20:20:04 +03:00
marcosptf a49260f197 Update dict_suggest.phpt 2015-08-07 14:10:32 -03:00
marcosptf 01988890a0 Update broker_list_dicts.phpt 2015-08-07 14:08:26 -03:00
marcosptf 696ce3f1e7 Update dict_describe.phpt 2015-08-07 14:04:53 -03:00
Christoph M. Becker 4adbe41e2f Merge branch 'pull-request/1458'
* pull-request/1458:
  Check the function UConverter::getAvailable with parameter wrong
2015-08-07 18:17:21 +02:00
marcosptf b9d40accc4 Update dict_describe.phpt 2015-08-07 13:16:07 -03:00
marcosptf 3760fe3514 Update broker_list_dicts.phpt 2015-08-07 13:12:46 -03:00
marcosptf 348cb72ad7 Create dict_suggest.phpt 2015-08-07 11:44:30 -03:00
marcosptf aed64ccab6 Rename dict_quick_check.phpt to dict_quick_check_01.phpt 2015-08-07 11:42:29 -03:00
marcosptf 6f6b629e8f Create dict_store_replacement.phpt 2015-08-07 11:38:11 -03:00
marcosptf d26b5cab41 Create dict_suggest.phpt 2015-08-07 11:37:40 -03:00
marcosptf e6bc14b6df Create dict_is_in_session.phpt 2015-08-07 11:37:04 -03:00
marcosptf b3a96b3aaa Create dict_get_error.phpt 2015-08-07 11:36:29 -03:00
marcosptf 90f9516cd9 Create dict_describe.phpt 2015-08-07 11:35:35 -03:00
marcosptf 86c0df077a Create dict_check.phpt 2015-08-07 11:34:57 -03:00
marcosptf 196f02d42c Create dict_add_to_session.phpt 2015-08-07 11:34:25 -03:00
marcosptf b2976db7a5 Create dict_add_to_personal.phpt 2015-08-07 11:33:51 -03:00
marcosptf d0bbbbabcf Create broker_set_ordering.phpt 2015-08-07 11:33:03 -03:00
marcosptf a0896433c0 Create broker_request_dict_01.phpt 2015-08-07 11:32:29 -03:00
marcosptf 92e525d1b6 Create broker_list_dicts.phpt 2015-08-07 11:31:25 -03:00
marcosptf ba018d85cd Create broker_get_error.phpt 2015-08-07 11:30:15 -03:00
marcosptf 6430f5dfd5 Rename broker_free.phpt to broker_free_01.phpt 2015-08-07 11:29:16 -03:00
marcosptf 1dd428afd2 Create broker_dict_exists.phpt 2015-08-07 11:25:33 -03:00
Christoph M. Becker e8d1ef56ff Merge branch 'pull-request/1460'
* pull-request/1460:
  Update UPGRADING about new substr() behavior
2015-08-07 15:05:27 +02:00
Anatol Belski 07f8845205 fix datatype 2015-08-07 10:12:20 +02:00
Nicolas Grekas 948bb1aa26 Update UPGRADING about new substr() behavior 2015-08-07 09:12:02 +02:00
Ferenc Kovacs 0de4e57cce Merge branch 'PHP-5.6'
* PHP-5.6:
  fix NEWS
2015-08-07 08:47:21 +02:00
Christoph M. Becker 3f242f1f89 fixed mixed up NEWS entries 2015-08-06 19:04:51 +02:00
Dmitry Stogov 6fc358241b Use specialized efree_size() 2015-08-06 18:04:17 +03:00
Rodrigo Prado 6bd3ace67e Check the function UConverter::getAvailable with parameter wrong 2015-08-06 00:10:37 -03:00
Bob Weinand ad4d139f29 Make bin2hex() and hex2bin() timing safe 2015-08-04 22:07:13 +02:00
Xinchen Hui d0bea17d2e Improve the conditions(save one comparison) 2015-07-15 10:55:41 +08:00
Xinchen Hui 32a4507abc Fixed segfault if opcache is disabled and with file_cache 2015-07-15 10:38:23 +08:00
Xinchen Hui 453ec91dfe Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T) 2015-07-14 18:59:36 +08:00
Lior Kaplan ad929bf68b Format alignment (needed for news2html) 2015-07-14 12:00:26 +03:00
Lior Kaplan a3fea0568b Format alignment (needed for news2html) 2015-07-14 11:28:53 +03:00
Christoph M. Becker 80b6a13553 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #53840: Misleading extension entries in php.ini
2015-07-14 10:11:50 +02:00
Christoph M. Becker 72554891e3 Fix #53840: Misleading extension entries in php.ini
As of PHP 5.3.0 the php_pspell.dll is not delivered anymore with the Windows
binaries, and according to bug #47464 that's highly unlike to change. So it's
appropriate to remove the respective extension entry from php.ini.
2015-07-14 10:09:29 +02:00
Christoph M. Becker 9f4135ad80 Merge branch 'master' of http://git.php.net/repository/php-src
# By Bob Weinand (5) and others
# Via Bob Weinand
* 'master' of http://git.php.net/repository/php-src:
  We want to track phpdbg bugs in official bug tracker now; updated URL
  Show also runtime-bound functions/classes/methods with phpdbg -p
  One less comparison
  Fix potential segfault
  Closures only have {closure}() as method name Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
  Fix __METHOD__ in functions nested into methods
  Init variable to NULL before passing to zpp
  Format alignment
  PHP 7 OCI8: fix bug57702.phpt regression
2015-07-14 10:02:25 +02:00
Bob Weinand 50866846c4 We want to track phpdbg bugs in official bug tracker now; updated URL 2015-07-14 08:31:44 +02:00
Bob Weinand 762c6dd666 Show also runtime-bound functions/classes/methods with phpdbg -p 2015-07-14 06:28:53 +02:00
Rasmus Lerdorf 611ff0c846 One less comparison 2015-07-13 19:44:51 -07:00
Rasmus Lerdorf 1ce4e8c45e Fix potential segfault 2015-07-13 19:38:55 -07:00
Bob Weinand bce9368dfb Closures only have {closure}() as method name
Prefixing a class name does not make sense as they may be rebound to another scope, where this will be confusing
2015-07-14 02:52:09 +02:00
Bob Weinand 1003d01f3a Fix __METHOD__ in functions nested into methods 2015-07-14 02:37:35 +02:00
Bob Weinand 07c425cc29 Init variable to NULL before passing to zpp 2015-07-14 01:56:05 +02:00
Lior Kaplan 51ce31e0c4 Format alignment 2015-07-14 02:43:11 +03:00
Christopher Jones c20f00f765 PHP 7 OCI8: fix bug57702.phpt regression 2015-07-14 08:39:59 +10:00
Christoph M. Becker ae5d04cd6a Merge branch 'master' of http://git.php.net/repository/php-src
# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src:
  remove #ifdef
  remove comment, it's not right
2015-07-14 00:30:17 +02:00
Anatol Belski 9db46a392b remove #ifdef 2015-07-14 00:12:35 +02:00
Anatol Belski b19aea3742 remove comment, it's not right 2015-07-13 23:43:43 +02:00
Christoph M. Becker cdf4d35e30 Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (6) and others
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px
  update NEWS
  Fixed bug #70065 curl_getinfo() returns corrupted values
  Revert SplFileInfo BC break while keeping fix for assertion removal
  Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
  updated NEWS
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
2015-07-13 22:39:12 +02:00
Christoph M. Becker e9eee76840 updated NEWS 2015-07-13 22:33:43 +02:00
Christoph M. Becker 20eaa186fb Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #66882: imagerotate by -90 degrees truncates image by 1px
2015-07-13 22:30:43 +02:00
Christoph M. Becker 140e80acc0 updated NEWS 2015-07-13 22:29:10 +02:00
Christoph M. Becker 2e34febb73 Fix #66882: imagerotate by -90 degrees truncates image by 1px
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
2015-07-13 22:18:56 +02:00
Christoph M. Becker 36439cf7b8 Fix #66882: imagerotate by -90 degrees truncates image by 1px
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
2015-07-13 22:14:13 +02:00
Anatol Belski 961fb9b569 update NEWS 2015-07-13 21:48:45 +02:00
Anatol Belski cefd010739 Fixed bug #70065 curl_getinfo() returns corrupted values 2015-07-13 21:47:42 +02:00
Anthony Ferrara 21686f1b30 Revert SplFileInfo BC break while keeping fix for assertion removal
This reverts the minor bc-break where .test would return an empty extension. This is different from 5.x's behavior.

In 7, it would result in an assertion failure crash. The fix for the removal of this assertion is kept, keeping BC with 5.x.
2015-07-13 13:27:06 -04:00
Anthony Ferrara 4b78636f3f Fix issue with SplFileInfo::getExtension() on files with only a leading '.' character
Currently, there is an assert() that fails on files like .gitignore crashing PHP. This patch fixes that.
Instead, now an empty string is returned (since the file has no extension). A test has been added to test this behavior.
2015-07-13 13:12:45 -04:00
Christoph M. Becker e10e0a02aa updated NEWS 2015-07-13 18:39:11 +02:00
Christoph M. Becker fabc1b7174 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
2015-07-13 18:36:15 +02:00
Christoph M. Becker 72c2fc44e0 updated NEWS 2015-07-13 18:34:40 +02:00
Christoph M. Becker 1a4722a89e Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.
2015-07-13 18:30:33 +02:00
Christoph M. Becker 2a2d3e88e6 Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
  Fix weird asm instruction order with gcc by marking as volatile in phpdbg
  Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
2015-07-13 17:50:26 +02:00
Christoph M. Becker 54b288ad92 updated NEWS 2015-07-13 15:59:40 +02:00
Christoph M. Becker 959b2c3514 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
2015-07-13 15:56:39 +02:00
Christoph M. Becker 25e5c8ac31 updated NEWS 2015-07-13 15:54:57 +02:00
Christoph M. Becker fa53d8463f Fix #69024: imagescale segfault with palette based image
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].

[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3>
2015-07-13 15:48:48 +02:00
Christoph M. Becker bccbd2df21 Fix #69024: imagescale segfault with palette based image
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].

[1] <https://github.com/libgd/libgd/commit/723ea520bed3b5854df87393c687323d3930edf3>
2015-07-13 15:43:16 +02:00
Bob Weinand 3f10eddd1d Fix weird asm instruction order with gcc by marking as volatile in phpdbg 2015-07-13 14:12:53 +02:00
Bob Weinand 82b1e22b57 Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled 2015-07-13 14:12:45 +02:00
Christoph M. Becker e990c809bb Merge branch 'master' of http://git.php.net/repository/php-src
# By Xinchen Hui (5) and others
# Via Xinchen Hui (6) and others
* 'master' of http://git.php.net/repository/php-src:
  Revert "Fixed test fail in travis from time to time"
  Fixed test fail in travis from time to time
  Update NEWS
  Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
  Fixed Bug #70058 Build fails when building for i386
  Some OCI8 fixes (Rajendra)
  Updated zend_update_static_property
  updated NEWS
  updated NEWS
  Fix #53154: Zero-height rectangle has whiskers
  Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow.
  Hint label lookup table initialization branch on GOTO VM kind.
  adding scenario of test to improve test coverage
  Added php tests to improve extension coverage
2015-07-13 13:59:33 +02:00
Xinchen Hui 420b745a05 Merge branch 'shmop-extension_improve-test-coverage' of https://github.com/edgarsandi/php-src 2015-07-13 19:12:18 +08:00
Xinchen Hui 646694529f Merge branch 'basename-function_improve-test-coverage' of https://github.com/edgarsandi/php-src 2015-07-13 19:08:25 +08:00
Xinchen Hui 833e4ced87 Merge branch 'goto_branch_hint' of https://github.com/bogdanandone/php-src 2015-07-13 19:07:11 +08:00
Xinchen Hui 5384ccf5bb Revert "Fixed test fail in travis from time to time"
Some tests rely on this warning... :<

This reverts commit aed4c03cf9.
2015-07-13 17:22:34 +08:00
Xinchen Hui 8c2658ed52 Merge branch 'master' of https://github.com/Geolim4/php-src 2015-07-13 16:40:56 +08:00
Xinchen Hui aed4c03cf9 Fixed test fail in travis from time to time 2015-07-13 16:36:19 +08:00
Xinchen Hui 3b170531c4 Update NEWS 2015-07-13 16:24:54 +08:00
Xinchen Hui e5a996f268 Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining) 2015-07-13 16:22:55 +08:00
Xinchen Hui eef41c57a3 Merge branch 'zend_update_static_property' of https://github.com/dreamsxin/php-src 2015-07-13 16:02:21 +08:00
Xinchen Hui b8eff44b0e Fixed Bug #70058 Build fails when building for i386
(I don't have a m32 build env, so this is not tested)
2015-07-13 15:05:04 +08:00
Christopher Jones 8586e67c1c Some OCI8 fixes (Rajendra) 2015-07-13 11:50:00 +10:00
Dreamsxin 7554e83037 Updated zend_update_static_property 2015-07-13 08:42:18 +08:00
Christopher Jones a846ff5d52 Merge branch 'master' of https://git.php.net/repository/php-src 2015-07-13 09:56:00 +10:00
Christoph M. Becker 1d16d106f4 updated NEWS 2015-07-13 01:50:09 +02:00
Christoph M. Becker 42d1fa29c7 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #53154: Zero-height rectangle has whiskers
2015-07-13 01:46:09 +02:00
Christoph M. Becker 2939bce9f3 updated NEWS 2015-07-13 01:41:46 +02:00
Christoph M. Becker 094decc3c0 Fix #53154: Zero-height rectangle has whiskers
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:33:00 +02:00
Christoph M. Becker d87a3312e3 Fix #53154: Zero-height rectangle has whiskers
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:29:01 +02:00
Christoph M. Becker ecd32e437e Merge branch 'master' of http://git.php.net/repository/php-src
* 'master' of http://git.php.net/repository/php-src:
  updated NEWS
  updated NEWS
  Fix #67447: imagecrop() adds a black line when cropping
2015-07-13 00:33:18 +02:00
Christoph M. Becker 33da8a60d9 updated NEWS 2015-07-12 23:18:59 +02:00
Christoph M. Becker 930a9910d7 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #67447: imagecrop() adds a black line when cropping
2015-07-12 23:15:06 +02:00
Christoph M. Becker 591fd4cdc3 updated NEWS 2015-07-12 23:13:13 +02:00
Christoph M. Becker 891ff131ef Fix #67447: imagecrop() adds a black line when cropping
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
2015-07-12 23:05:53 +02:00
Christoph M. Becker 0002f18af6 Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (3) and Tjerk Meesters (1)
# Via Christoph M. Becker (1) and Tjerk Meesters (1)
* 'master' of http://git.php.net/repository/php-src:
  Fixed #70053	MutlitpleIterator array-keys incompatible change in PHP 7
  updated NEWS
  updated NEWS
  Fix #68714: copy 'n paste error
2015-07-12 19:06:09 +02:00
Tjerk Meesters 03d18d9a52 Fixed #70053 MutlitpleIterator array-keys incompatible change in PHP 7 2015-07-13 00:33:55 +08:00
Christoph M. Becker fcdf1d0527 updated NEWS 2015-07-12 16:43:38 +02:00
Christoph M. Becker ce7b5af03f Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #68714: copy 'n paste error
2015-07-12 16:39:50 +02:00
Christoph M. Becker c0ac51dc07 updated NEWS 2015-07-12 16:38:23 +02:00
Christoph M. Becker ba7c3a1bb4 Fix #68714: copy 'n paste error
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
2015-07-12 16:32:38 +02:00
Christoph M. Becker 3aad9bd3ee Fix #68714: copy 'n paste error
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
2015-07-12 16:26:16 +02:00
Christoph M. Becker a50dda901c Merge branch 'PHP-5.6'
* PHP-5.6:
  Added XFAIL test for bug #53640
2015-07-12 00:12:31 +02:00
Christoph M. Becker a8dbe655e5 Added XFAIL test for bug #53640 2015-07-12 00:10:56 +02:00
Geolim4 c10c47ae1e Fix #70048: When running a phpinfo(), if you have a very long cell value you got a table overflow. 2015-07-11 21:44:23 +02:00
Christoph M. Becker 649fd428d9 updated NEWS 2015-07-11 21:03:40 +02:00
Christoph M. Becker 77cd79012e Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #66339: PHP segfaults in imagexbm
2015-07-11 21:01:01 +02:00
Christoph M. Becker bac1fe7438 updated NEWS 2015-07-11 20:58:50 +02:00
Christoph M. Becker c40f40656e Fix #66339: PHP segfaults in imagexbm
The file parameter of the XBM image ZPP is not properly taken into account. If
it is NULL that would result in a segfault, because gdImageXbmCtx() is not
prepared to take a NULL file_name. If it is not NULL the XBM data would be
written to STDOUT, because the stream is not initialized. This patch fixes both
issues.
2015-07-11 20:54:07 +02:00
Christoph M. Becker 1a94e51859 updated NEWS 2015-07-11 17:56:33 +02:00
Christoph M. Becker 6f574c6dd8 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #70047: gd_info() doesn't report WebP support
2015-07-11 17:52:22 +02:00
Christoph M. Becker 6ac4c57f72 updated NEWS 2015-07-11 17:50:42 +02:00
Christoph M. Becker 450fbdc740 Fix #70047: gd_info() doesn't report WebP support
Despite being documented, the array returned by gd_info() doesn't have a 'WebP
Support' key. This patch adds it.
2015-07-11 17:49:13 +02:00
Xinchen Hui e63c756c09 Better implementation 2015-07-11 18:59:09 +08:00
Christoph M. Becker 0cd9c4eb2b Merge branch 'PHP-5.6'
* PHP-5.6:
  Adding tests for getprotobyname and getprotobynumber functions
2015-07-11 00:20:46 +02:00
Rasmus Lerdorf 1af1afdfdc DOMDocument::saveXML has a 2nd optional arg 2015-07-10 15:17:06 -07:00
Edgar R. Sandi 49c0c1299a Adding tests for getprotobyname and getprotobynumber functions 2015-07-11 00:16:42 +02:00
Bob Weinand 0584df0ad9 hmm, we do not need the nop after compilation, so does not matter for opcache... 2015-07-10 23:35:05 +02:00
Bob Weinand 56800e470b a: try { ... } ≠ try { a: ... } 2015-07-10 23:29:07 +02:00
Ferenc Kovacs ed62db9abc Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing NEWS entry
2015-07-10 17:26:09 +02:00
Ferenc Kovacs a7dc1274f0 add missing NEWS entry 2015-07-10 17:25:44 +02:00
Xinchen Hui 8e709d7f5d Fixed invalid read (Part issue of #69579) 2015-07-10 22:26:53 +08:00
Nikita Popov 25d327e53f Move try/catch/finally tests to common directory 2015-07-10 13:35:14 +02:00
Nikita Popov 725fed4902 Mark temporary_cleaning_006.phpt as XFAIL
And adjust it to fail even with opcode.
2015-07-10 13:33:32 +02:00
Nikita Popov bd72fdca98 Better opcode dump for finally
* Move opcode decode into opline decode, so we can adjust it for
  extended_value.
* Show extended_value and secondary jump ops for FAST_CALL and
  FAST_RET.
2015-07-10 11:39:54 +02:00
Xinchen Hui 95ff2852ee Micro optimization 2015-07-10 16:39:21 +08:00
Xinchen Hui f930d6ea0e Fixed Bug #69996 (Changing the property of a cloned object affects the original) 2015-07-10 16:33:13 +08:00
Bogdan Andone e27cbe6542 Hint label lookup table initialization branch on GOTO VM kind.
This initialization is performed only once so it shall be marked as unexpected.
2015-07-10 11:18:40 +03:00
Xinchen Hui 54305c8952 Fixed No 2 issue in #1400 2015-07-10 16:04:45 +08:00
Xinchen Hui a3f05d640d Fixed Issue #1400 (double free static property) 2015-07-10 15:27:06 +08:00
Dmitry Stogov ef1b588f6a Resolve GOTO at compile time and replace it with sequnce of FREE/FE_FREE and JMP. 2015-07-10 04:44:21 +03:00
Dmitry Stogov 44f7348caa Exception thrown by "return" statement (from TMP destructors) shouldn't be caught in the same function 2015-07-10 04:13:34 +03:00
Dmitry Stogov 3bb70fe290 Readded tests 2015-07-10 03:46:57 +03:00
Dmitry Stogov bafe9d8c30 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  add missing NEWS entry
  PDO_OCI LOB fixes (Senthil)
  Improve test portability (Senthil)
  Add new test section.  Diff with query 5 is still to be resolved
  Add Oracle syntax (Senthil)
2015-07-10 03:32:46 +03:00
Dmitry Stogov 549e8c4959 Squashed commit of the following:
commit 03cf871f1576f08b2348c141b209894a7bf17a86
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:31 2015 +0300

    Revert "Fixed bug #62210 (Exceptions can leak temporary variables. As a part of the fix serious refactoring was done. op_array->brk_cont_array was removed, and replaced with more general and speed efficient op_array->T_liveliness. ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time). (Bob, Dmitry, Laruence)"

    This reverts commit 5ee8413259.

commit 285a68227ce3d380e821a24fa389aa5239bd3fe1
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:26 2015 +0300

    Revert "Tuned off dubugging of live ranges"

    This reverts commit 404dc93d35.

commit 93d9d11157301ee2ec99afb6f5744b126d17f637
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:17 2015 +0300

    Revert "Remove loop_var_stack"

    This reverts commit b3a4c05071.

commit ede68ebbc284aec79e3f719f2c8dbf9da6907752
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:12 2015 +0300

    Revert "ZEND_SEPARATE reuses temporaries"

    This reverts commit 1852f538b9.

commit 96d8995dc1f517fb01b481736273767509f76c47
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:10 2015 +0300

    Revert "Add assertion in liveliness computation"

    This reverts commit ed14019e8c.

commit 0649d7bfef152e6cc8e67b922534e9946c634d9c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:07 2015 +0300

    Revert "Fixed invalid live-range detection"

    This reverts commit 54f367ee2a.

commit dfe8f3851f6b04595eb089323e3492115a59363e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:04 2015 +0300

    Revert "Add test guaranteeing that loop vars are only freed after potential return type exceptions"

    This reverts commit f5db5a558d.

commit 52a94aad6f48a199358cc07f7e4f56bb73050504
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:45:01 2015 +0300

    Revert "Fixed exception habdling on "return" statement."

    This reverts commit 17c5315bdf.

commit 6e90ad7331901711e89c2ceb2bcab5023e5cee60
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:44:58 2015 +0300

    Revert "Fix too early terminated temporary range with break/cont/goto"

    This reverts commit cc876c04b4.

commit 7b766e44b1970e4031f75109c302c07ead2c05cb
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 10 02:44:55 2015 +0300

    Revert "Fixed exception catching on break/continue"

    This reverts commit 8c3f701eeb.
2015-07-10 03:31:52 +03:00
Ferenc Kovacs bf09c28aca Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing NEWS entry
2015-07-10 02:31:16 +02:00
Ferenc Kovacs ec25f69c5d add missing NEWS entry 2015-07-10 02:30:29 +02:00
Christopher Jones bcb1c2fe03 PDO_OCI LOB fixes (Senthil) 2015-07-10 09:55:36 +10:00
Christopher Jones 268a333232 Improve test portability (Senthil) 2015-07-10 09:53:45 +10:00
Christopher Jones e79433743a Add new test section. Diff with query 5 is still to be resolved 2015-07-10 09:49:10 +10:00
Christopher Jones a3c54dd1b7 Add Oracle syntax (Senthil) 2015-07-10 09:47:45 +10:00
Nikita Popov a49ce7bb91 Don't return T_ERROR from token_get_all()
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
2015-07-09 23:02:21 +02:00
Anatol Belski fc5c7e633b refix the NEWS 2015-07-09 22:56:11 +02:00
Dmitry Stogov 8c3f701eeb Fixed exception catching on break/continue
Fixed "finaly" handling on exception in "return" statement
2015-07-09 23:20:50 +03:00
Edgar R. Sandi 28c3b55fa8 adding scenario of test to improve test coverage 2015-07-09 16:43:31 -03:00
Nikita Popov 788c4c852d Fix posix_setrlimit segfault 2015-07-09 20:40:07 +02:00
Bob Weinand cc876c04b4 Fix too early terminated temporary range with break/cont/goto
I have no crashing or leaking reproduce script, only valgrind invalid reads for that one; hence no phpt here
2015-07-09 20:07:57 +02:00
Ferenc Kovacs 9591b1cc3c Merge branch 'PHP-5.6'
* PHP-5.6:
  move the use-after-free fixes to 5.6.11
2015-07-09 20:02:18 +02:00
Ferenc Kovacs ab66152c68 move the use-after-free fixes to 5.6.11 2015-07-09 20:01:37 +02:00
Dmitry Stogov 17c5315bdf Fixed exception habdling on "return" statement.
Such exceptions shouldn't be caught in the same function.
2015-07-09 20:47:25 +03:00
Nikita Popov d91aad5966 Fix bug #69430
Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.
2015-07-09 19:11:48 +02:00
Nikita Popov 8abc3022b0 Update token_get_all() arginfo 2015-07-09 18:19:12 +02:00
Bob Weinand f5db5a558d Add test guaranteeing that loop vars are only freed after potential return type exceptions 2015-07-09 16:54:41 +02:00
Dmitry Stogov 54f367ee2a Fixed invalid live-range detection 2015-07-09 17:38:29 +03:00
Dmitry Stogov b77fa94cf9 Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0 2015-07-09 12:19:51 +03:00
Dmitry Stogov 225bb70498 Added missing API functions 2015-07-09 12:19:30 +03:00
Xinchen Hui 0de0c4ace1 Fixed Bug #70032 (make_http_soap_request calls zend_hash_get_current_key_ex(,,,NULL)) 2015-07-09 16:36:31 +08:00
Magnus Määttä a55ca9a8d1 Fix posix_setrlimit() to use int as values instead of strings.
Add constant for unlimited (POSIX_RLIMIT_INFINITY).
2015-07-09 00:04:13 +02:00
Magnus Määttä 963d906aff Add posix_setrlimit() FR #54603 2015-07-08 22:12:07 +02:00
Dmitry Stogov 301ee26568 Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected).
CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE().
As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 18:33:58 +03:00
Julien Pauli 993a658ada Merge branch 'PHP-5.6'
* PHP-5.6:
  5.5.27 release
2015-07-08 17:00:47 +02:00
Julien Pauli b1a9b89773 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.27 release

Conflicts:
	main/php_version.h
2015-07-08 17:00:29 +02:00
Julien Pauli 34b624f122 5.5.27 release 2015-07-08 16:59:44 +02:00
Bob Weinand 3ccc17cee5 Working fix for ctrl+d on readline/libedit 2015-07-08 16:54:41 +02:00
Xinchen Hui 5460929077 Merge branch 'PHP-5.6' 2015-07-08 22:35:10 +08:00
Xinchen Hui c75d245e82 Revert "Fixed invalid read"
I must be confused while switching from master to 5.6

This reverts commit 94957a7091.
2015-07-08 22:34:27 +08:00
Xinchen Hui ffccf19fa6 Merge branch 'master' of git.php.net:php-src 2015-07-08 19:31:36 +08:00
Xinchen Hui da333bfbd8 Fixed bug #70018 (exec does not strip all whitespace)
Merge branch 'PHP-5.6'

Conflicts:
	ext/standard/exec.c
2015-07-08 19:30:58 +08:00
Anatol Belski dd1f0940fe fix NEWS 2015-07-08 13:27:34 +02:00
Xinchen Hui 94957a7091 Fixed invalid read 2015-07-08 19:19:37 +08:00
Xinchen Hui f9dc60f36f Merge branch 'master' of git.php.net:php-src 2015-07-08 18:25:04 +08:00
Xinchen Hui b9e48073b3 Make sure fast_call_var is initialized properly 2015-07-08 18:24:27 +08:00
Nikita Popov ed14019e8c Add assertion in liveliness computation
Assert that a live-range does not start, while one for the same
variable is already active.

To satisfy this constraint, explicitly exclude writes from JMP_SET
and COALESCE. They were previously also handled correctly, because
their result variable was only killed after the second write to it
after the false branch. This just makes it more explicit.
2015-07-08 12:00:39 +02:00
Xinchen Hui 249915f938 Add comment to explaining the new check 2015-07-08 17:44:54 +08:00
Xinchen Hui 3b5876916d Remove outdate comment 2015-07-08 17:42:50 +08:00
Xinchen Hui c6037bd3af Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:15:09 +08:00
Xinchen Hui 6154fc77be Merge branch 'PHP-5.6' 2015-07-08 17:14:32 +08:00
Xinchen Hui ca30d5bf39 Fixed bug #70012 (Exception lost with nested finally block) 2015-07-08 17:14:19 +08:00
Aaron Piotrowski 1c7619491e Fix failing tests from exception code changes 2015-07-07 23:14:05 -05:00
Kalle Sommer Nielsen b84363f7fa PHP 7.0.0 Beta 2 NEWS 2015-07-08 02:37:59 +02:00
Nikita Popov 1852f538b9 ZEND_SEPARATE reuses temporaries 2015-07-08 00:13:23 +02:00
Stanislav Malyshev 496f291f3d 5.4.44 next 2015-07-07 15:07:28 -07:00
Aaron Piotrowski a1a83bf5f0 Switch code on thrown TypeError and ParseError to 0, update related tests 2015-07-07 16:54:39 -05:00
Christoph M. Becker dbadf447b2 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed typo in test for bug #66985
2015-07-07 23:39:18 +02:00
Christoph M. Becker e68b5252a2 fixed typo in test for bug #66985 2015-07-07 23:35:28 +02:00
Bob Weinand 7a8ea0f60d Properly exit on EOF on stdin in readline mode 2015-07-07 22:45:34 +02:00
Edgar R. Sandi 18dfbf9008 Added php tests to improve extension coverage 2015-07-07 10:50:23 -03:00
Reeze Xia 4e2afbc1a0 Fixed phpdbg build broken when dtrace enabled
This also fixed a zend_string related warning
2015-04-07 23:04:34 +08:00
725 changed files with 49996 additions and 138097 deletions

No files matched your search

+4 -4
View File
@@ -101,7 +101,7 @@ define dump_bt
____print_str $zvalue->value.str->val $zvalue->value.str->len
end
if $type == 7
printf "array(%d)[%p]", $zvalue->value.arr->ht->nNumOfElements, $zvalue
printf "array(%d)[%p]", $zvalue->value.arr->nNumOfElements, $zvalue
end
if $type == 8
printf "object[%p]", $zvalue
@@ -152,8 +152,8 @@ define ____printzv_contents
set $type = $zvalue->u1.v.type
# 15 == IS_INDIRECT
if $type >= 5 && $type != 15
printf "(refcount=%d) ", $zvalue->value.counted->refcount
if $type > 5 && $type != 15
printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
end
if $type == 0
@@ -181,7 +181,7 @@ define ____printzv_contents
printf "array: "
if ! $arg1
set $ind = $ind + 1
____print_ht $zvalue->value.arr
____print_ht $zvalue->value.arr 1
set $ind = $ind - 1
set $i = $ind
while $i > 0
+3
View File
@@ -21,6 +21,9 @@
*.tar.gz
*.tar.bz2
*.tar.xz
*.tar.gz.asc
*.tar.bz2.asc
*.tar.xz.asc
.FBCIndex
.FBCLockFolder
.deps
+2 -5
View File
@@ -1,13 +1,11 @@
language: c
branches:
except:
- phpng
notifications:
email:
on_failure: change
irc:
template:
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} - Change view : %{compare_url} - Build details : %{build_url}"
channels:
- "irc.efnet.org#php.pecl"
on_success: change
@@ -50,4 +48,3 @@ before_script:
# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --set-timeout 120
- ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg
+351 -29
View File
@@ -1,5 +1,331 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
17 Sep 2015, PHP 7.0.0 RC 3
- Core:
. Fixed bug #70431 (Memory leak in php_ini.c). (Senthil, Laruence)
. Fixed bug #70478 (**= does no longer work). (Bob)
- CLI server:
. Fixed bug #68291 (404 on urls with '+'). (cmb)
- DOM:
. Fixed bug #70001 (Assigning to DOMNode::textContent does additional entity
encoding). (cmb)
- Intl:
. Fixed bug #70453 (IntlChar::foldCase() incorrect arguments and missing
constants). (cmb)
. Fixed bug #70454 (IntlChar::forDigit second parameter should be optional).
(cmb, colinodell)
- Mysqlnd:
. Fixed bug #70456 (mysqlnd doesn't activate TCP keep-alive when connecting to
a server). (Sergei Turchanov)
- Opcache:
. Fixed bug #70423 (Warning Internal error: wrong size calculation). (Anatol)
- OpenSSL
. Fixed bug #55259 (openssl extension does not get the DH parameters from
DH key resource). (Jakub Zelenka)
. Fixed bug #70395 (Missing ARG_INFO for openssl_seal()). (cmb)
. Fixed bug #60632 (openssl_seal fails with AES). (Jakub Zelenka)
. Implemented FR #70438 (Add IV parameter for openssl_seal and openssl_open)
(Jakub Zelenka)
- Phpdbg:
. Fixed bug #70449 (PHP won't compile on 10.4 and 10.5 because of missing
constants). (Bob)
- Session:
. Fixed bug #70013 (Reference to $_SESSION is lost after a call to
session_regenerate_id()). (Yasuo)
- Standard:
. Implemented the RFC `Random Functions Throwing Exceptions in PHP 7`.
(Sammy Kaye Powers, Anthony)
. Fixed bug #70487 (pack('x') produces an error). (Nikita)
- Streams:
. Fixed bug #70361 (HTTP stream wrapper doesn't close keep-alive connections).
(Niklas Keller)
- XMLReader:
. Fixed bug #70309 (XmlReader read generates extra output). (Anatol)
- Zip:
. Fixed bug #70322 (ZipArchive::close() doesn't indicate errors). (cmb)
03 Sep 2015, PHP 7.0.0 RC 2
- Core:
. Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex).
(Dmitry, Bob, Laruence)
. Fixed bug #70332 (Wrong behavior while returning reference on object).
(Laruence, Dmitry)
. Fixed bug #70300 (Syntactical inconsistency with new group use syntax).
(marcio dot web2 at gmail dot com)
. Fixed bug #70321 (Magic getter breaks reference to array property).
(Laruence)
. Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized
data). (Dmitry)
. Fixed bug #70145 (From field incorrectly parsed from headers). (Anatol)
. Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
building extensions). (Adam)
. Fixed bug causing exception traces with anon classes to be truncated. (Bob)
. Fixed bug #70397 (Segmentation fault when using Closure::call and yield).
(Bob)
- Curl:
. Fixed bug #70330 (Segmentation Fault with multiple "curl_copy_handle").
(Laruence)
- EXIF:
. Fixed bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte
value of 32 bytes). (Stas)
- GMP:
. Fixed bug #70284 (Use after free vulnerability in unserialize() with GMP).
(stas)
- hash:
. Fixed bug #70312 (HAVAL gives wrong hashes in specific cases). (letsgolee
at naver dot com)
- Mysqli:
. Fixed bug #32490 (constructor of mysqli has wrong name). (cmb)
- Pcntl:
. Fixed bug #70386 (Can't compile on NetBSD because of missing WCONTINUED
and WIFCONTINUED). (Matteo)
- PCRE:
. Fixed bug #70232 (Incorrect bump-along behavior with \K and empty string
match). (cmb)
. Fixed bug #70345 (Multiple vulnerabilities related to PCRE functions).
(Anatol Belski)
- PDO:
. Fixed bug #70389 (PDO constructor changes unrelated variables). (Laruence)
- PDO_OCI:
. Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored). (Chris Jones)
- SOAP:
. Fixed bug #70388 (SOAP serialize_function_call() type confusion / RCE).
(Stas)
- SPL:
. Fixed bug #70303 (Incorrect constructor reflection for ArrayObject). (cmb)
- Standard:
. Fixed bug #70342 (changing configuration with ignore_user_abort(true) isn't
working). (Laruence)
. Fixed bug #70295 (Segmentation fault with setrawcookie). (Bob)
. Fixed bug #67131 (setcookie() conditional for empty values not met). (cmb)
. Fixed bug #70365 (Use-after-free vulnerability in unserialize() with
SplObjectStorage). (taoguangchen at icloud dot com)
. Fixed bug #70366 (Use-after-free vulnerability in unserialize() with
SplDoublyLinkedList). (taoguangchen at icloud dot com)
- Reflection:
. Fixed bug causing bogus traces for ReflectionGenerator::getTrace(). (Bob)
- XSLT:
. Fixed bug #69782 (NULL pointer dereference). (Stas)
- ZIP:
. Fixed bug #70350 (ZipArchive::extractTo allows for directory traversal when
creating directories). (neal at fb dot com)
20 Aug 2015, PHP 7.0.0 RC 1
- Core:
. Fixed bug #70299 (Memleak while assigning object offsetGet result).
(Laruence)
. Fixed bug #70288 (Apache crash related to ZEND_SEND_REF). (Laruence)
. Fixed bug #70262 (Accessing array crashes PHP 7.0beta3).
(Laruence, Dmitry)
. Fixed bug #70258 (Segfault if do_resize fails to allocated memory).
(Laruence)
. Fixed bug #70253 (segfault at _efree () in zend_alloc.c:1389). (Laruence)
. Fixed bug #70240 (Segfault when doing unset($var());). (Laruence)
. Fixed bug #70223 (Incrementing value returned by magic getter). (Laruence)
. Fixed bug #70215 (Segfault when __invoke is static). (Bob)
. Fixed bug #70207 (Finally is broken with opcache). (Laruence, Dmitry)
. Fixed bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc).
(Laruence, cmb)
. Fixed bug #69487 (SAPI may truncate POST data). (cmb)
. Fixed bug #70198 (Checking liveness does not work as expected).
(Shafreeck Sea, Anatol Belski)
. Fixed bug #70241/#70293 (Skipped assertions affect Generator returns). (Bob)
. Fixed bug #70239 (Creating a huge array doesn't result in exhausted,
but segfault). (Laruence, Anatol)
- CLI server:
. Fixed bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE).
(wusuopu, cmb)
. Fixed bug #70264 (CLI server directory traversal). (cmb)
- Date:
. Fixed bug #70245 (strtotime does not emit warning when 2nd parameter is
object or string). (cmb)
. Fixed bug #70266 (DateInterval::__construct.interval_spec is not supposed to
be optional). (cmb)
. Fixed bug #70277 (new DateTimeZone($foo) is ignoring text after null byte).
(cmb)
- MCrypt:
. Fixed bug #69833 (mcrypt fd caching not working). (Anatol)
- Opcache:
. Fixed bug #70237 (Empty while and do-while segmentation fault with opcode
on CLI enabled). (Dmitry, Laruence)
- PCRE:
. Fixed bug #70232 (Incorrect bump-along behavior with \K and empty string
match). (cmb)
- PDO:
. Fixed bug #70272 (Segfault in pdo_mysql). (Laruence)
. Fixed bug #70221 (persistent sqlite connection + custom function
segfaults). (Laruence)
- Phpdbg:
. Fixed bug #70214 (FASYNC not defined, needs sys/file.h include). (Bob)
- Standard:
. Fixed bug #70250 (extract() turns array elements to references).
(Laruence)
. Fixed bug #70211 (php 7 ZEND_HASH_IF_FULL_DO_RESIZE use after free).
(Laruence)
. Fixed bug #70208 (Assert breaking access on objects). (Bob)
06 Aug 2015, PHP 7.0.0 Beta 3
- Core:
. Fixed "finally" issues. (Nikita, Dmitry)
. Fixed bug #70098 (Real memory usage doesn't decrease). (Dmitry)
. Fixed bug #70159 (__CLASS__ is lost in closures). (Julien)
. Fixed bug #70156 (Segfault in zend_find_alias_name). (Laruence)
. Fixed bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION).
(Laruence)
. Fixed bug #70117 (Unexpected return type error). (Laruence)
. Fixed bug #70106 (Inheritance by anonymous class). (Bob)
. Fixed bug #69674 (SIGSEGV array.c:953). (cmb)
. Fixed bug #70164 (__COMPILER_HALT_OFFSET__ under namespace is not defined).
(Bob)
. Fixed bug #70108 (sometimes empty $_SERVER['QUERY_STRING']). (Anatol)
. Fixed bug #70179 ($this refcount issue). (Bob)
. Fixed bug #69896 ('asm' operand has impossible constraints). (Anatol)
. Fixed bug #70183 (null pointer deref (segfault) in zend_eval_const_expr).
(Hugh Davenport)
. Fixed bug #70182 (Segfault in ZEND_ASSIGN_DIV_SPEC_CV_UNUSED_HANDLER).
(Hugh Davenport)
. Fixed bug #69793 (Remotely triggerable stack exhaustion via recursive
method calls). (Stas)
. Fixed bug #69892 (Different arrays compare indentical due to integer key
truncation). (Nikita)
. Fixed bug #70121 (unserialize() could lead to unexpected methods execution
/ NULL pointer deref). (Stas)
- Curl:
. Fixed bug #70163 (curl_setopt_array() type confusion). (Laruence)
- IMAP:
. Fixed bug #70158 (Building with static imap fails). (cmb)
. Fixed bug #69998 (curl multi leaking memory). (Pierrick)
- Opcache:
. Fixed bug #70111 (Segfault when a function uses both an explicit return
type and an explicit cast). (Laruence)
- OpenSSL:
. Fixed bug #70014 (openssl_random_pseudo_bytes() is not cryptographically
secure). (Stas)
- Phar:
. Improved fix for bug #69441. (Anatol Belski)
. Fixed bug #70019 (Files extracted from archive may be placed outside of
destination directory). (Anatol Belski)
- Phpdbg:
. Fixed bug #70138 (Segfault when displaying memory leaks). (Bob)
- SOAP:
. Fixed bug #70081 (SoapClient info leak / null pointer dereference via
multiple type confusions). (Stas)
- SPL:
. Fixed bug #70068 (Dangling pointer in the unserialization of ArrayObject
items). (sean.heelan)
. Fixed bug #70166 (Use After Free Vulnerability in unserialize() with
SPLArrayObject). (taoguangchen at icloud dot com)
. Fixed bug #70168 (Use After Free Vulnerability in unserialize() with
SplObjectStorage). (taoguangchen at icloud dot com)
. Fixed bug #70169 (Use After Free Vulnerability in unserialize() with
SplDoublyLinkedList). (taoguangchen at icloud dot com)
- Standard:
. Fixed bug #70140 (str_ireplace/php_string_tolower - Arbitrary Code
Execution). (CVE-2015-6527) (Laruence)
. Implemented FR #70112 (Allow "dirname" to go up various times). (Remi)
. Fixed bug #36365 (scandir duplicates file name at every 65535th file). (cmb)
23 Jul 2015, PHP 7.0.0 Beta 2
- Core:
. Fixed bug #70089 (segfault at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ()).
(Laruence)
. Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive
inlining). (Laruence)
. Fixed bug #70012 (Exception lost with nested finally block). (Laruence)
. Fixed bug #69996 (Changing the property of a cloned object affects the
original). (Dmitry, Laruence)
. Fixed bug #70083 (Use after free with assign by ref to overloaded objects).
(Bob)
- Curl:
. Fixed bug #70065 (curl_getinfo() returns corrupted values). (Anatol)
- GD:
. Fixed bug #53156 (imagerectangle problem with point ordering). (cmb)
. Fixed bug #66387 (Stack overflow with imagefilltoborder). (cmb)
. Fixed bug #70102 (imagecreatefromwebm() shifts colors). (cmb)
. Fixed bug #66590 (imagewebp() doesn't pad to even length). (cmb)
. Fixed bug #66882 (imagerotate by -90 degrees truncates image by 1px). (cmb)
. Fixed bug #70064 (imagescale(..., IMG_BICUBIC) leaks memory). (cmb)
. Fixed bug #69024 (imagescale segfault with palette based image). (cmb)
. Fixed bug #53154 (Zero-height rectangle has whiskers). (cmb)
. Fixed bug #67447 (imagecrop() add a black line when cropping). (cmb)
. Fixed bug #68714 (copy 'n paste error). (cmb)
. Fixed bug #66339 (PHP segfaults in imagexbm). (cmb)
. Fixed bug #70047 (gd_info() doesn't report WebP support). (cmb)
. Replace libvpx with libwebp for bundled libgd. (cmb, Anatol)
- Opcache:
. Fixed bug #70058 (Build fails when building for i386). (Laruence)
. Fixed bug #70022 (Crash with opcache using opcache.file_cache_only=1).
(Anatol)
- Soap:
. Fixed bug #70079 (Segmentation fault after more than 100 SoapClient
calls). (Laruence)
. Fixed bug #70032 (make_http_soap_request calls
zend_hash_get_current_key_ex(,,,NULL). (Laruence)
- SPL:
. Fixed bug #70053 (MutlitpleIterator array-keys incompatible change in
PHP 7). (Tjerk)
- Standard:
. Fixed bug #70096 (Repeated iptcembed() adds superfluous FF bytes). (cmb)
. Fixed bug #70018 (exec does not strip all whitespace). (Laruence)
- Tokenizer:
. Fixed bug #69430 (token_get_all has new irrecoverable errors). (Nikita)
09 Jul 2015, PHP 7.0.0 Beta 1
- Core:
@@ -12,11 +338,6 @@ PHP NEWS
ArrayAccess object). (Laruence)
. Fixed bug #69957 (Different ways of handling div/mod/intdiv). (Bob)
. Fixed bug #69900 (Too long timeout on pipes). (Anatol)
. Fixed bug #62210 (Exceptions can leak temporary variables. As a part of
the fix serious refactoring was done. op_array->brk_cont_array was removed,
and replaced with more general and speed efficient op_array->T_liveliness.
ZEND_GOTO opcode is always replaced by ZEND_JMP at compile time).
(Bob, Dmitry, Laruence)
- CLI server:
. Fixed bug #69655 (php -S changes MKCALENDAR request method to MKCOL). (cmb)
@@ -25,7 +346,7 @@ PHP NEWS
- COM:
. Fixed bug #69939 (Casting object to bool returns false). (Kalle)
- JSON
- JSON:
. Fixed bug #62010 (json_decode produces invalid byte-sequences).
(Jakub Zelenka)
@@ -39,7 +360,7 @@ PHP NEWS
- OpenSSL:
. Fixed bug #69882 (OpenSSL error "key values mismatch" after
openssl_pkcs12_read with extra cert) (Tomasz Sawicki)
openssl_pkcs12_read with extra cert). (Tomasz Sawicki)
- PCRE:
. Fixed bug #53823 (preg_replace: * qualifier on unicode replace garbles the
@@ -53,16 +374,16 @@ PHP NEWS
. Fixed bug #69970 (Use-after-free vulnerability in
spl_recursive_it_move_forward_ex()). (Laruence)
- Sqlite3:
. Fixed bug #69972 (Use-after-free vulnerability in
sqlite3SafetyCheckSickOrOk()). (Laruence)
- Standard:
. Fixed bug #69983 (get_browser fails with user agent of null).
(Kalle, cmb, Laruence)
. Fixed bug #69976 (Unable to parse "all" urls with colon char). (cmb)
. Fixed bug #69768 (escapeshell*() doesn't cater to !). (cmb)
- Sqlite3:
. Fixed bug #69972 (Use-after-free vulnerability in
sqlite3SafetyCheckSickOrOk()). (Laruence)
25 Jun 2015, PHP 7.0.0 Alpha 2
- Core:
@@ -93,6 +414,10 @@ PHP NEWS
. Fixed bug #69893 (Strict comparison between integer and empty string keys
crashes). (Nikita)
- Curl:
. Fixed bug #69831 (Segmentation fault in curl_getinfo). (im dot denisenko at
yahoo dot com)
- DOM:
. Fixed bug #69846 (Segmenation fault (access violation) when iterating over
DOMNodeList). (Anatol Belski)
@@ -100,7 +425,7 @@ PHP NEWS
- GD:
. Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)
- JSON
- JSON:
. Fixed bug #68546 (json_decode() Fatal error: Cannot access property
started with '\0'). (Jakub Zelenka)
@@ -108,30 +433,26 @@ PHP NEWS
. Fixed Bug #69796 (mysqli_stmt::fetch doesn't assign null values to
bound variables). (Laruence)
- Curl:
. Fixed bug #69831 (Segmentation fault in curl_getinfo). (im dot denisenko at
yahoo dot com)
- Opcache:
. Removed opcache.load_comments configuration directive. Now doc comments
loading costs nothing and always enabled. (Dmitry)
. Fixed bug #69838 (Wrong size calculation for function table). (Anatol)
- PCRE:
. Fixed bug #69864 (Segfault in preg_replace_callback) (cmb, ab)
. Fixed bug #69864 (Segfault in preg_replace_callback). (cmb, ab)
- PDO_pgsql:
. Fixed bug #69752 (PDOStatement::execute() leaks memory with DML
Statements when closeCuror() is u). (Philip Hofstetter)
- SPL
- SPL:
. Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken). (Dmitry)
- SQLite3
- SQLite3:
. Fixed bug #69897 (segfault when manually constructing SQLite3Result).
(Kalle)
- Standard
- Standard:
. Fixed bug #62922 (Truncating entire string should result in string).
(Nikita)
@@ -206,6 +527,7 @@ PHP NEWS
. Improved zend_qsort(using hybrid sorting algo) for better performance,
and also renamed zend_qsort to zend_sort. (Laruence)
. Added stable sorting algo zend_insert_sort. (Laruence)
. Improved zend_memnchr(using sunday algo) for better performance. (Laruence)
. Implemented the RFC `Scalar Type Decalarations v0.5`. (Anthony)
. Implemented the RFC `Group Use Declarations`. (Marcio)
. Implemented the RFC `Continue Output Buffering`. (Mike)
@@ -236,7 +558,7 @@ PHP NEWS
. Added "v" DateTime format modifier to get the 3-digit version of fraction
of seconds. (Mariano Iglesias)
. Implemented FR #69089: Added DateTime::RFC3339_EXTENDED to output in
RFC3339 Extended format which includes fraction of seconds (Mariano
RFC3339 Extended format which includes fraction of seconds. (Mariano
Iglesias)
- DBA:
@@ -268,13 +590,13 @@ PHP NEWS
. Removed deprecated aliases datefmt_set_timezone_id() and
IntlDateFormatter::setTimeZoneID(). (Nikita)
- JSON
- JSON:
. Replace non-free JSON parser with a parser from Jsond extension, fixes #63520
(JSON extension includes a problematic license statement). (Jakub Zelenka)
. Fixed bug #68938 (json_decode() decodes empty string without error).
(jeremy at bat-country dot us)
- LDAP
- LDAP:
. Fixed bug #47222 (Implement LDAP_OPT_DIAGNOSTIC_MESSAGE). (Andreas Heigl)
- LiteSpeed:
@@ -310,7 +632,7 @@ PHP NEWS
- pcntl:
. Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
when setting SIG_DFL). (Julien)
. Added wifcontinued and wcontinued. (xilon-jul)
. Request #68505 (Added wifcontinued and wcontinued). (xilon-jul)
. Added rusage support to pcntl_wait() and pcntl_waitpid(). (Anton Stepanenko,
Tony)
@@ -329,7 +651,7 @@ PHP NEWS
. Removed PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT attribute in favor of
ATTR_EMULATE_PREPARES). (Nikita)
- Reflection
- Reflection:
. Fixed inheritance chain of Reflector interface. (Tjerk)
. Added ReflectionGenerator class. (Bob)
. Added reflection support for return types and type declarations. (Sara,
@@ -352,7 +674,7 @@ PHP NEWS
. Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
breaks the RecursiveIterator). (Paul Garvin)
- Sqlite3:
- SQLite3:
. Fixed bug #68260 (SQLite3Result::fetchArray declares wrong
required_num_args). (Julien)
@@ -397,9 +719,9 @@ PHP NEWS
- Zip:
. Added ZipArchive::setCompressionName and ZipArchive::setCompressionIndex
methods (Remi, Cedric Delmas)
. Update bundled libzip to 1.0.1 (Remi, Anatol)
. Fixed bug #67161. (ZipArchive::getStream() returns NULL for certain file)
methods. (Remi, Cedric Delmas)
. Update bundled libzip to 1.0.1. (Remi, Anatol)
. Fixed bug #67161 (ZipArchive::getStream() returns NULL for certain file).
(Christoph M. Becker)
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
+6 -6
View File
@@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following
some basic rules with regards to Git usage will::
a. Make everybody happier, especially those responsible for maintaining
Git itself.
PHP itself.
b. Keep the changes consistently well documented and easily trackable.
@@ -48,11 +48,11 @@ Currently we have the following branches in use::
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
stable version and is open for bugfixes only.
PHP-5.5 Is used to release the PHP 5.5.x series. This is a current
stable version and is open for bugfixes only.
PHP-5.5 Is used to release the PHP 5.5.x series. This is an old
stable version and is open for security fixes only.
PHP-5.4 Is used to release the PHP 5.4.x series. This is a current
stable version and is open for bugfixes only.
PHP-5.4 Is used to release the PHP 5.4.x series. This is an old
stable version and is open for security fixes only.
PHP-5.3 This branch is closed.
@@ -67,7 +67,7 @@ Currently we have the following branches in use::
The next few rules are more of a technical nature::
1. All changes should first go to the lowest branch (i.e. 5.4) and then
1. All changes should first go to the lowest branch (i.e. 5.6) and then
get merged up to all other branches. If a change is not needed for
later branches (i.e. fixes for features which where dropped from later
branches) an empty merge should be done.
+6 -2
View File
@@ -165,9 +165,11 @@ TSRM_API void *tsrm_get_ls_cache(void);
#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx
#define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache()
#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
#define TSRMG(id, type, element) (TSRMG_BULK(id, type)->element)
#define TSRMG_BULK(id, type) ((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])
#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
#define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element)
#define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
#if ZEND_DEBUG
@@ -200,6 +202,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
#define TSRMLS_CACHE_UPDATE()
#define TSRMLS_CACHE
#define TSRM_TLS
/* BC only */
#define TSRMLS_D void
#define TSRMLS_DC
+1 -1
View File
@@ -49,7 +49,7 @@ TSRMLS_CACHE_UPDATE();
globals->shm = NULL;
globals->process_size = 0;
globals->shm_size = 0;
globals->comspec = _strdup((GetVersion()<0x80000000)?"cmd.exe":"command.com");
globals->comspec = _strdup("cmd.exe");
/* Set it to INVALID_HANDLE_VALUE
* It will be initialized correctly in tsrm_win32_access or set to
+26 -6
View File
@@ -1,6 +1,4 @@
$Id$
PHP X.Y UPGRADE NOTES
PHP 7.0 UPGRADE NOTES
1. Backward Incompatible Changes
2. New Features
@@ -429,12 +427,12 @@ Other language changes
Standard library changes
========================
. substr() now returns an empty string instead of FALSE when the truncation happens on boundaries.
. call_user_method() and call_user_method_array() no longer exists.
. ob_start() no longer issues an E_ERROR, but instead an E_RECOVERABLE_ERROR in case an
output buffer is created in an output buffer handler.
. Improved zend_qsort(using hybrid sorting algo) for better performance,
and also renamed zend_qsort to zend_sort.
. Added stable sorting algo zend_insert_sort.
. The internal sorting algorithm has been improved, what may result in
different sort order of elements that compare as equal.
. Removed dl() function on fpm-fcgi.
. setcookie() with an empty cookie name now issues a WARNING and doesn't send an empty set-cookie header line anymore.
@@ -632,6 +630,13 @@ Other
on pipes. This option should be used carefully because due to the
platform restrictions dead locks on pipe buffers are possible.
- dirname()
A new optional argument ($levels) allow to go up various times
dirname(dirname($foo)) => dirname($foo, 2);
- debug_zval_dump
It prints now "int" instead of "long", and "float" instead of "double".
========================================
6. New Functions
========================================
@@ -646,6 +651,10 @@ Other
. Added intdiv() function for integer division.
. Added error_clear_last() function to reset error state.
- Zip:
. Added ZipArchive::setCompressionIndex() and ZipArchive::setCompressionName()
for setting the compression method.
- Zlib:
. Added deflate_init(), deflate_add(), inflate_init(), inflate_add()
functions allowing incremental/streaming compression/decompression.
@@ -695,6 +704,9 @@ out, that the corresponding SDK isn't available anymore.
Mhash is not an extension anymore, use function_exists("mhash") to check whether
it is avaliable.
- GD
The bundled libgd requires libwebp instead of libvpx for the WebP functionality.
========================================
10. New Global Constants
========================================
@@ -702,6 +714,11 @@ out, that the corresponding SDK isn't available anymore.
- Core
. PHP_INT_MIN added.
- PCRE
. This error constant is added to signal errors due to stack size limitations
when PCRE JIT support is enabled:
. PREG_JIT_STACKLIMIT_ERROR
- Zlib
. These constants are added to control flush behavior with the new
incremental deflate_add() and inflate_add() functions:
@@ -753,6 +770,9 @@ out, that the corresponding SDK isn't available anymore.
it depends alone on the openssl library. If it's present at the compile time,
ftp_ssl_connect() is enabled automatically.
- imap
. Static building of ext/imap is disabled
- odbc
. The odbc extension is always shipped shared
+29 -2
View File
@@ -1,5 +1,3 @@
$Id$
PHP 7.0 INTERNALS UPGRADE NOTES
0. Wiki Examples
@@ -21,6 +19,7 @@ PHP 7.0 INTERNALS UPGRADE NOTES
s. Resource API changes
t. Optimized strings concatenation.
u. Streams changes
v. Sort algorithm changes
2. Build system changes
a. Unix build system changes
@@ -194,6 +193,29 @@ changes. See: https://wiki.php.net/phpng-upgrading
into the destructor. So the previous example could look like
free(my_struct->vars); given the income was casted to (struct my_struct *).
A new macro was introduced to simplify the declaration to the extension
globals. A simplified declaration looks as follows
#define MYEXT_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(myext, v)
Another new macro ZEND_MODULE_GLOBALS_BULK(myext) delivers the corresponding
globals struct as a whole.
Two new storage specifiers was introduced.
ZEND_EXT_TLS - expand to an appropriate thread specific storage specifier in
the thread safe build, expands to empty in a non thread safe
build.
ZEND_TLS - expands to an appropriate thread specific storage specifier
with static visibility in the thread safe build, expands to
static specifier in a non thread safe build.
Variables declared with these storage specifiers can not be shared across
threads. While ZEND_TLS enforces the local scope visibility, ZEND_EXT_TLS
pertains to the visiblity across several compilation units. In both cases,
there's no portable way to achieve the visibility across shared objects.
Thus, these specifiers are not compatible with ZEND_API and PHPAPI specifiers.
q. gc_collect_cycles() is now a function pointer, and can be replaced in the
same manner as zend_execute_ex() if needed (for example, to include the
time spent in the garbage collector in a profiler). The default
@@ -219,6 +241,11 @@ changes. See: https://wiki.php.net/phpng-upgrading
using context stream option PHP_STREAM_OPTION_PIPE_BLOCKING or
adding STREAM_USE_BLOCKING_PIPE when opening the stream.
v. Sort algorithm changes
- Improved zend_qsort(using hybrid sorting algo) for better performance,
and also renamed zend_qsort to zend_sort.
- Added stable sorting algo zend_insert_sort.
========================
2. Build system changes
========================
+4 -1
View File
@@ -421,7 +421,6 @@ AC_ARG_ENABLE(gcc-global-regs,
AC_MSG_CHECKING(for global register variables support)
if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
AC_TRY_COMPILE([
],[
#if defined(__GNUC__)
# define ZEND_GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
#else
@@ -436,6 +435,9 @@ if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
#elif defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(__powerpc64__)
# define ZEND_VM_FP_GLOBAL_REG "r28"
# define ZEND_VM_IP_GLOBAL_REG "r29"
#elif defined(__IBMC__) && ZEND_GCC_VERSION >= 4002 && defined(__powerpc64__)
# define ZEND_VM_FP_GLOBAL_REG "r28"
# define ZEND_VM_IP_GLOBAL_REG "r29"
#else
# error "global register variables are not supported"
#endif
@@ -451,6 +453,7 @@ int emu(const opcode_handler_t *ip, void *fp) {
FP = orig_fp;
IP = orig_ip;
}
], [
], [
ZEND_GCC_GLOBAL_REGS=yes
], [
+14
View File
@@ -0,0 +1,14 @@
--TEST--
Ensure proper inheritance with get_class(anon class instance) used via class_alias (see also bug #70106)
--FILE--
<?php
class_alias(get_class(new class { protected $foo = 1; }), "AnonBase");
var_dump((new class extends AnonBase {
function getFoo() {
return $this->foo;
}
})->getFoo());
?>
--EXPECT--
int(1)
+11
View File
@@ -0,0 +1,11 @@
--TEST--
Ensure correct unmangling of private property names for anonymous class instances
--FILE--
<?php
var_dump(new class { private $foo; });
?>
--EXPECT--
object(class@anonymous)#1 (1) {
["foo":"class@anonymous":private]=>
NULL
}
+23
View File
@@ -0,0 +1,23 @@
--TEST--
Bug #70208 (scope information must be preserved with assert())
--FILE--
<?php
function non_class_scope() {
return true;
}
class test {
protected $prop = 1;
public function __construct() {
assert('non_class_scope();');
var_dump($this->prop);
}
}
new test;
?>
--EXPECT--
int(1)
@@ -0,0 +1,11 @@
--TEST--
Empty statement in assert() shouldn't segfault
--FILE--
<?php
assert((function () { return true;; })());
echo "ok";
?>
--EXPECT--
ok
+10
View File
@@ -0,0 +1,10 @@
--TEST--
'break' error (non positive numbers)
--FILE--
<?php
function foo () {
break 0;
}
?>
--EXPECTF--
Fatal error: 'break' operator accepts only positive numbers in %sbreak_error_001.php on line 3
+10
View File
@@ -0,0 +1,10 @@
--TEST--
'break' error (operator with non-constant operand)
--FILE--
<?php
function foo () {
break $x;
}
?>
--EXPECTF--
Fatal error: 'break' operator with non-constant operand is no longer supported in %sbreak_error_002.php on line 3
+10
View File
@@ -0,0 +1,10 @@
--TEST--
'break' error (not in the loop context)
--FILE--
<?php
function foo () {
break;
}
?>
--EXPECTF--
Fatal error: 'break' not in the 'loop' or 'switch' context in %sbreak_error_003.php on line 3
+12
View File
@@ -0,0 +1,12 @@
--TEST--
'break' error (wrong level)
--FILE--
<?php
function foo () {
while (1) {
break 2;
}
}
?>
--EXPECTF--
Fatal error: Cannot 'break' 2 levels in %sbreak_error_004.php on line 4
-6
View File
@@ -1,11 +1,5 @@
--TEST--
Bug #62358 (Segfault when using traits a lot)
--SKIPIF--
<?php
if (getenv("USE_ZEND_ALLOC") !== "0") {
die("skip Need Zend MM enabled");
}
?>
--FILE--
<?php
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Bug #62441: Incorrect strong typing in namespaced child classes
--FILE--
<?php
namespace {
interface Iface {
function method(stdClass $o);
}
}
namespace ns {
class Foo implements \Iface {
function method(stdClass $o) { }
}
(new Foo)->method(new \stdClass);
}
?>
--EXPECTF--
Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d
+6
View File
@@ -1,5 +1,11 @@
--TEST--
Bug #68412 (Infinite recursion with __call can make the program crash/segfault)
--SKIPIF--
<?php
if (getenv("USE_ZEND_ALLOC") !== "1") {
die("skip Need Zend MM enabled");
}
?>
--FILE--
<?php
class C {
+1 -1
View File
@@ -5,4 +5,4 @@ Bug #69640 Unhandled Error thrown from userland do not produce any output
throw new \ParseError('I mess everything up! :trollface:');
?>
--EXPECTF--
Fatal error: I mess everything up! :trollface: in %sbug69640.php on line 2
Parse error: I mess everything up! :trollface: in %sbug69640.php on line 2
+4 -3
View File
@@ -24,7 +24,8 @@ Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16
Notice: Only variables should be assigned by reference in %sbug69732.php on line 16
Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6
XXX
+2 -1
View File
@@ -11,5 +11,6 @@ var_dump(serialize($instance));
--EXPECTF--
Fatal error: Uncaught Exception: Serialization of 'class@%s' is not allowed in %sbug69761.php:%d
Stack trace:
#0 %sbug69761.php(%d): serialize(Object(class@%s
#0 %sbug69761.php(%d): serialize(Object(class@anonymous))
#1 {main}
thrown in %sbug69761.php on line %d
+25
View File
@@ -0,0 +1,25 @@
--TEST--
Bug #69996 (Changing the property of a cloned object affects the original)
--FILE--
<?php
function method($cache) {
$prepared = clone $cache;
var_dump($prepared->data);
$prepared->data = "bad";
return $prepared;
}
$cache = new stdClass();
$cache->data = "good";
for ($i = 0; $i < 5; ++$i) {
method($cache);
}
?>
--EXPECT--
string(4) "good"
string(4) "good"
string(4) "good"
string(4) "good"
string(4) "good"
+32
View File
@@ -0,0 +1,32 @@
--TEST--
Bug #70012 (Exception lost with nested finally block)
--FILE--
<?php
try {
echo "Outer try\n";
try {
echo " Middle try\n";
throw new Exception();
} finally {
echo " Middle finally\n";
try {
echo " Inner try\n";
} finally {
echo " Inner finally\n";
}
}
echo "Outer shouldnt get here\n";
} catch (Exception $e) {
echo "Outer catch\n";
} finally {
echo "Outer finally\n";
}
?>
--EXPECT--
Outer try
Middle try
Middle finally
Inner try
Inner finally
Outer catch
Outer finally
+37
View File
@@ -0,0 +1,37 @@
--TEST--
Bug #70089 (segfault in PHP 7 at ZEND_FETCH_DIM_W_SPEC_VAR_CONST_HANDLER ())
--INI--
opcache.enable=0
--FILE--
<?php
function dummy($a) {
}
try {
chr(0)[0][] = 1;
} catch (Error $e) {
var_dump($e->getMessage());
}
try {
unset(chr(0)[0][0]);
} catch (Error $e) {
var_dump($e->getMessage());
}
eval("function runtimetest(&\$a) {} ");
try {
runtimetest(chr(0)[0]);
} catch (Error $e) {
var_dump($e->getMessage());
}
try {
++chr(0)[0];
} catch (Error $e) {
var_dump($e->getMessage());
}
?>
--EXPECTF--
string(36) "Cannot use string offset as an array"
string(27) "Cannot unset string offsets"
string(41) "Only variables can be passed by reference"
string(64) "Cannot increment/decrement overloaded objects nor string offsets"
+21
View File
@@ -0,0 +1,21 @@
--TEST--
Bug #70117 (Unexpected return type error)
--FILE--
<?php
function &foo() :string {
$a = array(1);
$b = &$a[0];
return $b;
}
function &foo1() :string {
$a = array("ref");
return $a[0];
}
var_dump(foo());
var_dump(foo1());
--EXPECT--
string(1) "1"
string(3) "ref"
+9
View File
@@ -0,0 +1,9 @@
--TEST--
Bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref)
--FILE--
<?php
unserialize('O:12:"DateInterval":1:{s:4:"days";O:9:"Exception":7:{s:10:"'."\0".'*'."\0".'message";s:1:"x";s:17:"'."\0".'Exception'."\0".'string";s:1:"A";s:7:"'."\0".'*'."\0".'code";i:0;s:7:"'."\0".'*'."\0".'file";s:1:"a";s:7:"'."\0".'*'."\0".'line";i:1337;s:16:"'."\0".'Exception'."\0".'trace";a:0:{}s:19:"'."\0".'Exception'."\0".'previous";O:8:"stdClass":0:{}}}');
?>
OK
--EXPECT--
OK
+47
View File
@@ -0,0 +1,47 @@
--TEST--
Bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION_SPEC_HANDLER)
--FILE--
<?php
try {
echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$f("test"))],chr(48));
} catch (Error $e) {
var_dump($e->getMessage());
}
class A {
}
try {
echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),a::y("test"))],chr(48));
} catch (Error $e) {
var_dump($e->getMessage());
}
$a = new A;
try {
echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$a->y("test"))],chr(48));
} catch (Error $e) {
var_dump($e->getMessage());
}
try {
echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),\bar\y("test"))],chr(48));
} catch (Error $e) {
var_dump($e->getMessage());
}
try {
echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),y("test"))],chr(48));
} catch (Error $e) {
var_dump($e->getMessage());
}
?>
--EXPECTF--
Notice: Undefined variable: f in %sbug70124.php on line %d
string(30) "Function name must be a string"
string(31) "Call to undefined method A::y()"
string(31) "Call to undefined method A::y()"
string(34) "Call to undefined function bar\y()"
string(30) "Call to undefined function y()"
+37
View File
@@ -0,0 +1,37 @@
--TEST--
Bug #70156 (Segfault in zend_find_alias_name)
--FILE--
<?php
trait T1 {
protected function foo1()
{
$this->bar();
}
}
trait T2 {
protected function foo2()
{
debug_print_backtrace();
}
}
class dummy {
use T1 {
foo1 as private;
}
use T2 {
foo2 as bar;
}
public function __construct()
{
$this->foo1();
}
}
new dummy();
?>
--EXPECTF--
#0 dummy->bar() called at [%sbug70156.php:%d]
#1 dummy->foo1() called at [%sbug70156.php:%d]
#2 dummy->__construct() called at [%sbug70156.php:%d]
+30
View File
@@ -0,0 +1,30 @@
--TEST--
__COMPILER_HALT_OFFSET__ is a "magic" constant, which should work if referenced directly, even in a namespace
--FILE--
<?php
namespace {
echo __COMPILER_HALT_OFFSET__, "\n";
echo \__COMPILER_HALT_OFFSET__, "\n";
}
namespace Foo {
echo __COMPILER_HALT_OFFSET__, "\n";
echo \__COMPILER_HALT_OFFSET__, "\n";
echo namespace\__COMPILER_HALT_OFFSET__, "\n";
}
__halt_compiler();
?>
--EXPECTF--
%d
%d
%d
%d
Fatal error: Uncaught Error: Undefined constant 'Foo\__COMPILER_HALT_OFFSET__' in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+13
View File
@@ -0,0 +1,13 @@
--TEST--
Bug #70173 (ZVAL_COPY_VALUE_EX broken for 32bit Solaris Sparc)
--SKIPIF--
<?php
if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
?>
--FILE--
<?php
$var = 2900000000;
var_dump($var);
?>
--EXPECT--
float(2900000000)
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #70179 ($this refcount issue)
--FILE--
<?php
class X {
function __invoke() {
var_dump($this);
}
}
(new X)();
?>
--EXPECT--
object(X)#1 (0) {
}
+14
View File
@@ -0,0 +1,14 @@
--TEST--
Bug #70182 ($string[] assignment with +=)
--FILE--
<?php
$str = "abc";
$str[] += $str;
?>
--EXPECTF--
Fatal error: Uncaught Error: [] operator not supported for strings in %sbug70182.php:%d
Stack trace:
#0 {main}
thrown in %sbug70182.php on line %d
+8
View File
@@ -0,0 +1,8 @@
--TEST--
Bug #70183 (null pointer deref (segfault) in zend_eval_const_expr)
--FILE--
<?php
[[][]]
?>
--EXPECTF--
Fatal error: Cannot use [] for reading in %sbug70183.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
--FILE--
<?php
class A {
public $b;
}
$a = new A;
var_dump($a); // force properties HT
unset($a->b);
var_dump(serialize($a));
?>
--EXPECT--
object(A)#1 (1) {
["b"]=>
NULL
}
string(12) "O:1:"A":0:{}"
+11
View File
@@ -0,0 +1,11 @@
--TEST--
Bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
--FILE--
<?php
$a = 1;
unset($a);
unserialize(serialize($GLOBALS));
echo "ok\n";
?>
--EXPECT--
ok
+21
View File
@@ -0,0 +1,21 @@
--TEST--
Bug #70215 (Segfault when invoke is static)
--FILE--
<?php
class A {
public static function __invoke() {
echo __CLASS__;
}
}
class B extends A { }
$b = new B;
$b();
?>
--EXPECTF--
Warning: The magic method __invoke() must have public visibility and cannot be static in %s on line %d
A
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Bug #70223 (Incrementing value returned by magic getter)
--FILE--
<?php
class A {
private $foo = 0;
public function &__get($foo){ return $this->foo; }
}
$a = new A;
echo $a->f++;
echo $a->f++;
echo $a->f++;
?>
--EXPECT--
012
+8
View File
@@ -0,0 +1,8 @@
--TEST--
Bug #70240 (Segfault when doing unset($var()))
--FILE--
<?php
unset($var());
?>
--EXPECTF--
Fatal error: Can't use function return value in write context in %sbug70240.php on line %d
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Bug #70241 (Skipped assertions affect Generator returns)
--INI--
zend.assertions=-1
--FILE--
<?php
function foo () {
assert(yield 1);
return null;
}
var_dump(foo() instanceof Generator);
?>
--EXPECT--
bool(true)
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Bug #70253 (segfault at _efree () in zend_alloc.c:1389)
--INI--
memory_limit=2M
--SKIPIF--
<?php
$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
if ($zend_mm_enabled === "0") {
die("skip Zend MM disabled");
}
?>
--FILE--
<?php
unserialize('a:2:{i:0;O:9:"000000000":10000000');
?>
--EXPECTF--
Fatal error: Allowed memory size of 2097152 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
+28
View File
@@ -0,0 +1,28 @@
--TEST--
Bug #70258 (Segfault if do_resize fails to allocated memory)
--INI--
memory_limit=2M
--SKIPIF--
<?php
$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
if ($zend_mm_enabled === "0") {
die("skip Zend MM disabled");
}
?>
--FILE--
<?php
class A {
public $arr;
public function core() {
$this->arr["no_pack"] = 1;
while (1) {
$this->arr[] = 1;
}
}
}
$a = new A;
$a->core();
?>
--EXPECTF--
Fatal error: Allowed memory size of 2097152 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
+30
View File
@@ -0,0 +1,30 @@
--TEST--
Bug #70262 (Accessing array crashes)
--FILE--
<?php
$array = array();
$array[] = 1; // make this not immutable
$extra = $array; // make the refcount == 2
class A {
public function getObj($array) {
$obj = new Stdclass;
$obj->arr = $array; // make the refcount == 3;
return $obj;
}
}
$a = new A;
$a->getObj($array) //use function call to get a refcount == 1 IS_VAR object
->arr // FETCH_OBJ_W will EXTRACT_ZVAL_PTR because getObj() result a refcount == 1 object (READY_TO_DESTROY)
[0] = "test"; //We will get a refcount == 3 array (not a IS_INDIRCT) in ZEND_ASSIGN_DIM_SPEC_VAR_CONST_HANDLER
var_dump($array);
?>
--EXPECT--
array(1) {
[0]=>
int(1)
}
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Bug #70288 (Apache crash related to ZEND_SEND_REF)
--FILE--
<?php
class A {
public function __get($name) {
return new Stdclass();
}
}
function test(&$obj) {
var_dump($obj);
}
$a = new A;
test($a->dummy);
?>
--EXPECTF--
object(stdClass)#%d (0) {
}
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Crash with specific assertions and zend.assertions=-1
--INI--
zend.assertions=-1
--FILE--
<?php
function f() {
assert(@$a ?: 1);
echo "OK";
};
f();
?>
--EXPECT--
OK
+49
View File
@@ -0,0 +1,49 @@
--TEST--
bug #70321 (Magic getter breaks reference to array property)
--FILE--
<?php
class foo implements arrayAccess
{
private $bar;
public function __construct()
{
$this->bar = new bar();
}
public function & __get($key)
{
$bar = $this->bar;
return $bar;
}
public function & offsetGet($key) {
$bar = $this->bar;
return $bar;
}
public function offsetSet($key, $val) {
}
public function offsetUnset($key) {
}
public function offsetExists($key) {
}
}
class bar { public $onBaz = []; }
$foo = new foo();
$foo->bar->onBaz[] = function() {};
var_dump($foo->bar->onBaz);
$foo = new foo();
$foo["bar"]->onBaz[] = function() {};
var_dump($foo->bar->onBaz);
?>
--EXPECTF--
array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
array(1) {
[0]=>
object(Closure)#%d (0) {
}
}
+24
View File
@@ -0,0 +1,24 @@
--TEST--
Bug #70332 (Wrong behavior while returning reference on object)
--FILE--
<?php
function & test($arg) {
return $arg;
}
$arg = new Stdclass();
$arg->name = array();
test($arg)->name[1] = "xxxx";
print_r($arg);
?>
--EXPECT--
stdClass Object
(
[name] => Array
(
[1] => xxxx
)
)
+15
View File
@@ -0,0 +1,15 @@
--TEST--
Bug #70397 (Segmentation fault when using Closure::call and yield)
--FILE--
<?php
$f = function () {
$this->value = true;
yield $this->value;
};
var_dump($f->call(new class {})->current());
?>
--EXPECT--
bool(true)
+18
View File
@@ -0,0 +1,18 @@
--TEST--
Bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
--FILE--
<?php
define("FILE_STREAM", fopen("php://temp", "r"));
define("FILE_STREAMS", array(fopen("php://temp", "r")));
var_dump(FILE_STREAM);
var_dump(FILE_STREAMS);
?>
--EXPECTF--
resource(%d) of type (stream)
array(1) {
[0]=>
resource(%d) of type (stream)
}
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Bug #70478 (**= does no longer work)
--FILE--
<?php
class foo {
public $a = 3;
private $b = 4;
function __construct() {
$this->a **= $this->b;
}
}
$a = new foo;
var_dump($a->a);
?>
--EXPECT--
int(81)
+1 -1
View File
@@ -23,7 +23,7 @@ $o->func();
?>
===DONE===
--EXPECTF--
Test::{closure}()
{closure}()
Fatal error: Uncaught Error: Call to private method Test::func() from context '' in %sclosure_033.php:%d
Stack trace:
@@ -0,0 +1,15 @@
--TEST--
Closure with variadic type hint
--FILE--
<?php
$f = function (stdClass ...$a) {
var_dump($a);
};
$f(new stdClass);
?>
--EXPECT--
array(1) {
[0]=>
object(stdClass)#2 (0) {
}
}
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Ensure proper backtraces with anon classes
--FILE--
<?php
(function($obj) {
throw new Exception();
})(new class {});
?>
--EXPECTF--
Fatal error: Uncaught Exception in %s:%d
Stack trace:
#0 %s(%d): {closure}(Object(class@anonymous))
#1 {main}
thrown in %s on line %d
@@ -0,0 +1,18 @@
--TEST--
Generators must return a valid variable with return type specified
--FILE--
<?php
$gen = (function (): Generator {
1 + $a = 1; // force a temporary
return true;
yield;
})();
var_dump($gen->valid());
var_dump($gen->getReturn());
?>
--EXPECT--
bool(false)
bool(true)
+16
View File
@@ -0,0 +1,16 @@
--TEST--
goto inside foreach
--FILE--
<?php
foreach ([0] as $x) {
goto a;
a:
echo "loop\n";
}
echo "done\n";
?>
--EXPECT--
loop
done
+57 -21
View File
@@ -7,9 +7,16 @@ class Obj
{
function empty(){ echo __METHOD__, PHP_EOL; }
function callable(){ echo __METHOD__, PHP_EOL; }
function class(){ echo __METHOD__, PHP_EOL; }
function trait(){ echo __METHOD__, PHP_EOL; }
function extends(){ echo __METHOD__, PHP_EOL; }
function implements(){ echo __METHOD__, PHP_EOL; }
function static(){ echo __METHOD__, PHP_EOL; }
function abstract(){ echo __METHOD__, PHP_EOL; }
function final(){ echo __METHOD__, PHP_EOL; }
function public(){ echo __METHOD__, PHP_EOL; }
function protected(){ echo __METHOD__, PHP_EOL; }
function private(){ echo __METHOD__, PHP_EOL; }
function const(){ echo __METHOD__, PHP_EOL; }
function enddeclare(){ echo __METHOD__, PHP_EOL; }
function endfor(){ echo __METHOD__, PHP_EOL; }
@@ -22,6 +29,7 @@ class Obj
function instanceof(){ echo __METHOD__, PHP_EOL; }
function insteadof(){ echo __METHOD__, PHP_EOL; }
function interface(){ echo __METHOD__, PHP_EOL; }
function namespace(){ echo __METHOD__, PHP_EOL; }
function new(){ echo __METHOD__, PHP_EOL; }
function or(){ echo __METHOD__, PHP_EOL; }
function xor(){ echo __METHOD__, PHP_EOL; }
@@ -62,22 +70,33 @@ class Obj
function die(){ echo __METHOD__, PHP_EOL; }
function self(){ echo __METHOD__, PHP_EOL; }
function parent(){ echo __METHOD__, PHP_EOL; }
function public(){ echo __METHOD__, PHP_EOL; }
function protected(){ echo __METHOD__, PHP_EOL; }
function private(){ echo __METHOD__, PHP_EOL; }
function static(){ echo __METHOD__, PHP_EOL; }
function abstract(){ echo __METHOD__, PHP_EOL; }
function final(){ echo __METHOD__, PHP_EOL; }
function class(){ echo __METHOD__, PHP_EOL; }
function isset(){ echo __METHOD__, PHP_EOL; }
function unset(){ echo __METHOD__, PHP_EOL; }
function __CLASS__(){ echo __METHOD__, PHP_EOL; }
function __TRAIT__(){ echo __METHOD__, PHP_EOL; }
function __FUNCTION__(){ echo __METHOD__, PHP_EOL; }
function __METHOD__(){ echo __METHOD__, PHP_EOL; }
function __LINE__(){ echo __METHOD__, PHP_EOL; }
function __FILE__(){ echo __METHOD__, PHP_EOL; }
function __DIR__(){ echo __METHOD__, PHP_EOL; }
function __NAMESPACE__(){ echo __METHOD__, PHP_EOL; }
function __halt_compiler(){ echo __METHOD__, PHP_EOL; }
}
$obj = new Obj;
$obj->empty();
$obj->callable();
$obj->class();
$obj->trait();
$obj->extends();
$obj->implements();
$obj->static();
$obj->abstract();
$obj->final();
$obj->public();
$obj->protected();
$obj->private();
$obj->const();
$obj->enddeclare();
$obj->endfor();
@@ -90,6 +109,7 @@ $obj->goto();
$obj->instanceof();
$obj->insteadof();
$obj->interface();
$obj->namespace();
$obj->new();
$obj->or();
$obj->xor();
@@ -130,22 +150,33 @@ $obj->catch();
$obj->die();
$obj->self();
$obj->parent();
$obj->public();
$obj->protected();
$obj->private();
$obj->static();
$obj->abstract();
$obj->final();
$obj->class();
$obj->isset();
$obj->unset();
$obj->__CLASS__();
$obj->__TRAIT__();
$obj->__FUNCTION__();
$obj->__METHOD__();
$obj->__LINE__();
$obj->__FILE__();
$obj->__DIR__();
$obj->__NAMESPACE__();
$obj->__halt_compiler();
echo "\nDone\n";
--EXPECTF--
Obj::empty
Obj::callable
Obj::class
Obj::trait
Obj::extends
Obj::implements
Obj::static
Obj::abstract
Obj::final
Obj::public
Obj::protected
Obj::private
Obj::const
Obj::enddeclare
Obj::endfor
@@ -158,6 +189,7 @@ Obj::goto
Obj::instanceof
Obj::insteadof
Obj::interface
Obj::namespace
Obj::new
Obj::or
Obj::xor
@@ -198,12 +230,16 @@ Obj::catch
Obj::die
Obj::self
Obj::parent
Obj::public
Obj::protected
Obj::private
Obj::static
Obj::abstract
Obj::final
Obj::class
Obj::isset
Obj::unset
Obj::__CLASS__
Obj::__TRAIT__
Obj::__FUNCTION__
Obj::__METHOD__
Obj::__LINE__
Obj::__FILE__
Obj::__DIR__
Obj::__NAMESPACE__
Obj::__halt_compiler
Done
+57 -21
View File
@@ -7,9 +7,16 @@ class Obj
{
static function empty(){ echo __METHOD__, PHP_EOL; }
static function callable(){ echo __METHOD__, PHP_EOL; }
static function class(){ echo __METHOD__, PHP_EOL; }
static function trait(){ echo __METHOD__, PHP_EOL; }
static function extends(){ echo __METHOD__, PHP_EOL; }
static function implements(){ echo __METHOD__, PHP_EOL; }
static function static(){ echo __METHOD__, PHP_EOL; }
static function abstract(){ echo __METHOD__, PHP_EOL; }
static function final(){ echo __METHOD__, PHP_EOL; }
static function public(){ echo __METHOD__, PHP_EOL; }
static function protected(){ echo __METHOD__, PHP_EOL; }
static function private(){ echo __METHOD__, PHP_EOL; }
static function const(){ echo __METHOD__, PHP_EOL; }
static function enddeclare(){ echo __METHOD__, PHP_EOL; }
static function endfor(){ echo __METHOD__, PHP_EOL; }
@@ -22,6 +29,7 @@ class Obj
static function instanceof(){ echo __METHOD__, PHP_EOL; }
static function insteadof(){ echo __METHOD__, PHP_EOL; }
static function interface(){ echo __METHOD__, PHP_EOL; }
static function namespace(){ echo __METHOD__, PHP_EOL; }
static function new(){ echo __METHOD__, PHP_EOL; }
static function or(){ echo __METHOD__, PHP_EOL; }
static function xor(){ echo __METHOD__, PHP_EOL; }
@@ -62,20 +70,31 @@ class Obj
static function die(){ echo __METHOD__, PHP_EOL; }
static function self(){ echo __METHOD__, PHP_EOL; }
static function parent(){ echo __METHOD__, PHP_EOL; }
static function public(){ echo __METHOD__, PHP_EOL; }
static function protected(){ echo __METHOD__, PHP_EOL; }
static function private(){ echo __METHOD__, PHP_EOL; }
static function static(){ echo __METHOD__, PHP_EOL; }
static function abstract(){ echo __METHOD__, PHP_EOL; }
static function final(){ echo __METHOD__, PHP_EOL; }
static function class(){ echo __METHOD__, PHP_EOL; }
static function isset(){ echo __METHOD__, PHP_EOL; }
static function unset(){ echo __METHOD__, PHP_EOL; }
static function __CLASS__(){ echo __METHOD__, PHP_EOL; }
static function __TRAIT__(){ echo __METHOD__, PHP_EOL; }
static function __FUNCTION__(){ echo __METHOD__, PHP_EOL; }
static function __METHOD__(){ echo __METHOD__, PHP_EOL; }
static function __LINE__(){ echo __METHOD__, PHP_EOL; }
static function __FILE__(){ echo __METHOD__, PHP_EOL; }
static function __DIR__(){ echo __METHOD__, PHP_EOL; }
static function __NAMESPACE__(){ echo __METHOD__, PHP_EOL; }
static function __halt_compiler(){ echo __METHOD__, PHP_EOL; }
}
Obj::empty();
Obj::callable();
Obj::class();
Obj::trait();
Obj::extends();
Obj::implements();
Obj::static();
Obj::abstract();
Obj::final();
Obj::public();
Obj::protected();
Obj::private();
Obj::const();
Obj::enddeclare();
Obj::endfor();
@@ -88,6 +107,7 @@ Obj::goto();
Obj::instanceof();
Obj::insteadof();
Obj::interface();
Obj::namespace();
Obj::new();
Obj::or();
Obj::xor();
@@ -128,22 +148,33 @@ Obj::catch();
Obj::die();
Obj::self();
Obj::parent();
Obj::public();
Obj::protected();
Obj::private();
Obj::static();
Obj::abstract();
Obj::final();
Obj::class();
Obj::isset();
Obj::unset();
Obj::__CLASS__();
Obj::__TRAIT__();
Obj::__FUNCTION__();
Obj::__METHOD__();
Obj::__LINE__();
Obj::__FILE__();
Obj::__DIR__();
Obj::__NAMESPACE__();
Obj::__halt_compiler();
echo "\nDone\n";
--EXPECTF--
Obj::empty
Obj::callable
Obj::class
Obj::trait
Obj::extends
Obj::implements
Obj::static
Obj::abstract
Obj::final
Obj::public
Obj::protected
Obj::private
Obj::const
Obj::enddeclare
Obj::endfor
@@ -156,6 +187,7 @@ Obj::goto
Obj::instanceof
Obj::insteadof
Obj::interface
Obj::namespace
Obj::new
Obj::or
Obj::xor
@@ -196,12 +228,16 @@ Obj::catch
Obj::die
Obj::self
Obj::parent
Obj::public
Obj::protected
Obj::private
Obj::static
Obj::abstract
Obj::final
Obj::class
Obj::isset
Obj::unset
Obj::__CLASS__
Obj::__TRAIT__
Obj::__FUNCTION__
Obj::__METHOD__
Obj::__LINE__
Obj::__FILE__
Obj::__DIR__
Obj::__NAMESPACE__
Obj::__halt_compiler
Done
+36
View File
@@ -69,6 +69,18 @@ class Obj
var $catch = 'catch';
var $die = 'die';
var $self = 'self';
var $parent = 'parent';
var $isset = 'isset';
var $unset = 'unset';
var $__CLASS__ = '__CLASS__';
var $__TRAIT__ = '__TRAIT__';
var $__FUNCTION__ = '__FUNCTION__';
var $__METHOD__ = '__METHOD__';
var $__LINE__ = '__LINE__';
var $__FILE__ = '__FILE__';
var $__DIR__ = '__DIR__';
var $__NAMESPACE__ = '__NAMESPACE__';
var $__halt_compiler = '__halt_compiler';
}
$obj = new Obj;
@@ -137,6 +149,18 @@ echo $obj->as, PHP_EOL;
echo $obj->catch, PHP_EOL;
echo $obj->die, PHP_EOL;
echo $obj->self, PHP_EOL;
echo $obj->parent, PHP_EOL;
echo $obj->isset, PHP_EOL;
echo $obj->unset, PHP_EOL;
echo $obj->__CLASS__, PHP_EOL;
echo $obj->__TRAIT__, PHP_EOL;
echo $obj->__FUNCTION__, PHP_EOL;
echo $obj->__METHOD__, PHP_EOL;
echo $obj->__LINE__, PHP_EOL;
echo $obj->__FILE__, PHP_EOL;
echo $obj->__DIR__, PHP_EOL;
echo $obj->__NAMESPACE__, PHP_EOL;
echo $obj->__halt_compiler, PHP_EOL;
echo "\nDone\n";
@@ -206,5 +230,17 @@ as
catch
die
self
parent
isset
unset
__CLASS__
__TRAIT__
__FUNCTION__
__METHOD__
__LINE__
__FILE__
__DIR__
__NAMESPACE__
__halt_compiler
Done
+33
View File
@@ -70,6 +70,17 @@ class Obj
static $die = 'die';
static $self = 'self';
static $parent = 'parent';
static $isset = 'isset';
static $unset = 'unset';
static $__CLASS__ = '__CLASS__';
static $__TRAIT__ = '__TRAIT__';
static $__FUNCTION__ = '__FUNCTION__';
static $__METHOD__ = '__METHOD__';
static $__LINE__ = '__LINE__';
static $__FILE__ = '__FILE__';
static $__DIR__ = '__DIR__';
static $__NAMESPACE__ = '__NAMESPACE__';
static $__halt_compiler = '__halt_compiler';
}
echo Obj::$empty, PHP_EOL;
@@ -137,6 +148,17 @@ echo Obj::$catch, PHP_EOL;
echo Obj::$die, PHP_EOL;
echo Obj::$self, PHP_EOL;
echo Obj::$parent, PHP_EOL;
echo Obj::$isset, PHP_EOL;
echo Obj::$unset, PHP_EOL;
echo Obj::$__CLASS__, PHP_EOL;
echo Obj::$__TRAIT__, PHP_EOL;
echo Obj::$__FUNCTION__, PHP_EOL;
echo Obj::$__METHOD__, PHP_EOL;
echo Obj::$__LINE__, PHP_EOL;
echo Obj::$__FILE__, PHP_EOL;
echo Obj::$__DIR__, PHP_EOL;
echo Obj::$__NAMESPACE__, PHP_EOL;
echo Obj::$__halt_compiler, PHP_EOL;
echo "\nDone\n";
@@ -206,5 +228,16 @@ catch
die
self
parent
isset
unset
__CLASS__
__TRAIT__
__FUNCTION__
__METHOD__
__LINE__
__FILE__
__DIR__
__NAMESPACE__
__halt_compiler
Done
+51 -18
View File
@@ -10,6 +10,12 @@ class Obj
const TRAIT = 'trait';
const EXTENDS = 'extends';
const IMPLEMENTS = 'implements';
const STATIC = 'static';
const ABSTRACT = 'abstract';
const FINAL = 'final';
const PUBLIC = 'public';
const PROTECTED = 'protected';
const PRIVATE = 'private';
const CONST = 'const';
const ENDDECLARE = 'enddeclare';
const ENDFOR = 'endfor';
@@ -63,12 +69,17 @@ class Obj
const DIE = 'die';
const SELF = 'self';
const PARENT = 'parent';
const PUBLIC = 'public';
const PROTECTED = 'protected';
const PRIVATE = 'private';
const STATIC = 'static';
const ABSTRACT = 'abstract';
const FINAL = 'final';
const ISSET = 'isset';
const UNSET = 'unset';
const __CLASS__ = '__CLASS__';
const __TRAIT__ = '__TRAIT__';
const __FUNCTION__ = '__FUNCTION__';
const __METHOD__ = '__METHOD__';
const __LINE__ = '__LINE__';
const __FILE__ = '__FILE__';
const __DIR__ = '__DIR__';
const __NAMESPACE__ = '__NAMESPACE__';
const __HALT_COMPILER = '__halt_compiler';
}
echo Obj::EMPTY, PHP_EOL;
@@ -76,6 +87,12 @@ echo Obj::CALLABLE, PHP_EOL;
echo Obj::TRAIT, PHP_EOL;
echo Obj::EXTENDS, PHP_EOL;
echo Obj::IMPLEMENTS, PHP_EOL;
echo Obj::STATIC, PHP_EOL;
echo Obj::ABSTRACT, PHP_EOL;
echo Obj::FINAL, PHP_EOL;
echo Obj::PUBLIC, PHP_EOL;
echo Obj::PROTECTED, PHP_EOL;
echo Obj::PRIVATE, PHP_EOL;
echo Obj::CONST, PHP_EOL;
echo Obj::ENDDECLARE, PHP_EOL;
echo Obj::ENDFOR, PHP_EOL;
@@ -129,12 +146,17 @@ echo Obj::CATCH, PHP_EOL;
echo Obj::DIE, PHP_EOL;
echo Obj::SELF, PHP_EOL;
echo Obj::PARENT, PHP_EOL;
echo Obj::PUBLIC, PHP_EOL;
echo Obj::PROTECTED, PHP_EOL;
echo Obj::PRIVATE, PHP_EOL;
echo Obj::STATIC, PHP_EOL;
echo Obj::ABSTRACT, PHP_EOL;
echo Obj::FINAL, PHP_EOL;
echo Obj::ISSET, PHP_EOL;
echo Obj::UNSET, PHP_EOL;
echo Obj::__CLASS__, PHP_EOL;
echo Obj::__TRAIT__, PHP_EOL;
echo Obj::__FUNCTION__, PHP_EOL;
echo Obj::__METHOD__, PHP_EOL;
echo Obj::__LINE__, PHP_EOL;
echo Obj::__FILE__, PHP_EOL;
echo Obj::__DIR__, PHP_EOL;
echo Obj::__NAMESPACE__, PHP_EOL;
echo Obj::__HALT_COMPILER, PHP_EOL;
echo "\nDone\n";
@@ -144,6 +166,12 @@ callable
trait
extends
implements
static
abstract
final
public
protected
private
const
enddeclare
endfor
@@ -197,11 +225,16 @@ catch
die
self
parent
public
protected
private
static
abstract
final
isset
unset
__CLASS__
__TRAIT__
__FUNCTION__
__METHOD__
__LINE__
__FILE__
__DIR__
__NAMESPACE__
__halt_compiler
Done
+29
View File
@@ -0,0 +1,29 @@
--TEST--
jump 15: goto from loop (forward)
--FILE--
<?php
$ar = array("1","2","3");
foreach ($ar as $val) {
switch ($val) {
case "1":
echo "1: ok\n";
break;
case "2":
echo "2: ok\n";
goto L1;
case "3":
echo "bug\n";
break;
}
}
echo "bug\n";
L1:
try {
echo "3: ok\n";
} finally {
}
?>
--EXPECT--
1: ok
2: ok
3: ok
@@ -0,0 +1,39 @@
--TEST--
active_class_entry must be always correct (__METHOD__ should not depend on declaring function ce)
--FILE--
<?php
namespace Baz;
class Foo {
public static function bar() {
function foo() {
var_dump(__FUNCTION__);
var_dump(__METHOD__);
var_dump(__CLASS__);
}
foo();
var_dump(__FUNCTION__);
var_dump(__METHOD__);
var_dump(__CLASS__);
return function() {var_dump(__FUNCTION__); var_dump(__METHOD__); var_dump(__CLASS__); };
}
}
$c = Foo::bar();
$c();
?>
--EXPECT--
string(7) "Baz\foo"
string(7) "Baz\foo"
string(7) "Baz\Foo"
string(3) "bar"
string(12) "Baz\Foo::bar"
string(7) "Baz\Foo"
string(13) "Baz\{closure}"
string(13) "Baz\{closure}"
string(7) "Baz\Foo"
+2 -3
View File
@@ -3,7 +3,7 @@ Type group use declarations should not allow override on inner itens
--FILE--
<?php
// should not throw syntax errors
// should throw syntax errors
use const Foo\Bar\{
A,
@@ -12,5 +12,4 @@ use const Foo\Bar\{
};
--EXPECTF--
Parse error: syntax error, unexpected 'const' (T_CONST), expecting identifier (T_STRING) or \\ (T_NS_SEPARATOR) in %s on line 7
Parse error: syntax error, unexpected 'const' (T_CONST), expecting identifier (T_STRING) in %s on line 7
+51
View File
@@ -0,0 +1,51 @@
--TEST--
Absolute namespaces should be allowed
--FILE--
<?php
namespace Foo\Bar {
class ClassA{}
class ClassB{}
class ClassC{}
function fn_a(){ return __FUNCTION__; }
function fn_b(){ return __FUNCTION__; }
function fn_c(){ return __FUNCTION__; }
const CONST_A = 1;
const CONST_B = 2;
const CONST_C = 3;
}
namespace Baz {
use \Foo\Bar\{ClassA, ClassB, ClassC};
use function \Foo\Bar\{fn_a, fn_b, fn_c};
use const \Foo\Bar\{CONST_A, CONST_B, CONST_C};
var_dump(ClassA::class);
var_dump(ClassB::class);
var_dump(ClassC::class);
var_dump(fn_a());
var_dump(fn_b());
var_dump(fn_c());
var_dump(CONST_A);
var_dump(CONST_B);
var_dump(CONST_C);
echo "\nDone\n";
}
?>
--EXPECTF--
string(14) "Foo\Bar\ClassA"
string(14) "Foo\Bar\ClassB"
string(14) "Foo\Bar\ClassC"
string(12) "Foo\Bar\fn_a"
string(12) "Foo\Bar\fn_b"
string(12) "Foo\Bar\fn_c"
int(1)
int(2)
int(3)
Done
+10
View File
@@ -0,0 +1,10 @@
--TEST--
Group use declaration list should not contain leading separator
--FILE--
<?php
use Foo\Bar\{\Baz};
?>
--EXPECTF--
Parse error: syntax error, unexpected '\' (T_NS_SEPARATOR), expecting identifier (T_STRING) or function (T_FUNCTION) or const (T_CONST) in %s on line 3
+25
View File
@@ -0,0 +1,25 @@
--TEST--
Temporary leak on exception
--XFAIL--
See Bug #62210 and attempt to fix it in "tmp_livelibess" branch
--FILE--
<?php
function ops() {
throw new Exception();
}
try {
$x = 2;
$y = new stdClass;
while ($x-- && new stdClass) {
$r = [$x] + ($y ? ((array) $x) + [2] : ops());
$y = (array) $y;
}
} catch (Exception $e) {
}
?>
==DONE==
--EXPECT--
==DONE==
+32
View File
@@ -0,0 +1,32 @@
--TEST--
Temporary leak on rope (encapsed string)
--FILE--
<?php
class Obj {
function __get($x) {
throw new Exception();
}
}
$x = new Obj;
$y = 0;
try {
$r = "$y|$x->x|";
} catch (Exception $e) {
}
try {
$r = "$x->x|$y|";
} catch (Exception $e) {
}
try {
$r = "$y|$y|$x->x";
} catch (Exception $e) {
}
?>
==DONE==
--EXPECT--
==DONE==
+21
View File
@@ -0,0 +1,21 @@
--TEST--
Fundamental memory leak test on temporaries
--XFAIL--
See Bug #62210 and attempt to fix it in "tmp_livelibess" branch
--FILE--
<?php
function ops() {
throw new Exception();
}
try{
$x = 1;
$r = [$x] + ops();
} catch (Exception $e) {
}
?>
==DONE==
--EXPECT--
==DONE==
+46
View File
@@ -0,0 +1,46 @@
--TEST--
Temporary leak with switch
--XFAIL--
See Bug #62210 and attempt to fix it in "tmp_livelibess" branch
--FILE--
<?php
function ops() {
throw new Exception();
}
$a = [new stdClass, new stdClass];
switch ($a[0]) {
case false:
break;
default:
try {
$x = 2;
$y = new stdClass;
while ($x-- && new stdClass) {
$r = [$x] + ($y ? ((array) $x) + [2] : ops());
$y = (array) $y;
}
} catch (Exception $e) {
}
}
try {
switch ($a[0]) {
case false:
break;
default:
$x = 2;
$y = new stdClass;
while ($x-- && new stdClass) {
$r = [$x] + ($y ? ((array) $x) + [2] : ops());
$y = (array) $y;
}
}
} catch (Exception $e) {
}
?>
==DONE==
--EXPECT--
==DONE==
+50
View File
@@ -0,0 +1,50 @@
--TEST--
Temporary leak with foreach
--XFAIL--
See Bug #62210 and attempt to fix it in "tmp_livelibess" branch
--FILE--
<?php
function ops() {
throw new Exception();
}
$a = [new stdClass, new stdClass];
foreach ([$a, [new stdClass]] as $b) {
switch ($b[0]) {
case false:
break;
default:
try {
$x = 2;
$y = new stdClass;
while ($x-- && new stdClass) {
$r = [$x] + ($y ? ((array) $x) + [2] : ops());
$y = (array) $y;
}
} catch (Exception $e) {
}
}
}
foreach ([$a, [new stdClass]] as $b) {
try {
switch ($b[0]) {
case false:
break;
default:
$x = 2;
$y = new stdClass;
while ($x-- && new stdClass) {
$r = [$x] + ($y ? ((array) $x) + [2] : ops());
$y = (array) $y;
}
}
} catch (Exception $e) {
}
}
?>
==DONE==
--EXPECT--
==DONE==
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Exception after separation during indirect write to fcall result
--XFAIL--
See Bug #62210 and attempt to fix it in "tmp_livelibess" branch
--FILE--
<?php
function throwing() { throw new Exception; }
function getArray($x) { return [$x]; }
try {
getArray(0)[throwing()] = 1;
} catch (Exception $e) {
echo "Exception\n";
}
?>
--EXPECT--
Exception
+22
View File
@@ -0,0 +1,22 @@
--TEST--
Exception inside a foreach loop with return
--FILE--
<?php
class saboteurTestController {
public function isConsistent() { throw new \Exception(); }
}
$controllers = array(new saboteurTestController(),new saboteurTestController());
foreach ($controllers as $controller) {
try {
if ($controller->isConsistent()) {
return $controller;
}
} catch (\Exception $e) {
echo "Exception\n";
}
}
?>
--EXPECT--
Exception
Exception
+16
View File
@@ -0,0 +1,16 @@
--TEST--
Bug #70228 (memleak if return in finally block)
--XFAIL--
See https://bugs.php.net/bug.php?id=70228
--FILE--
<?php
function foo() {
try { return str_repeat("a", 2); }
finally { return true; }
}
var_dump(foo());
?>
--EXPECT--
string(3) "bar"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+15
View File
@@ -0,0 +1,15 @@
--TEST--
There must be a difference between label: try { ... } and try { label: ... }
--FILE--
<?php
label: try {
goto label;
} finally {
print "success";
return; // don't loop
}
?>
--EXPECT--
success
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 725 files, more files were not shown because too many files have changed in this diff. Show more