Compare commits

...
2263 Commits
Author SHA1 Message Date
Anatol Belski 60fffd296a remove older UPGRADING entry, bug #38409 is already fixed in 5.6 2015-12-01 05:16:47 +01:00
Anatol Belski b70481688a bump versions 2015-11-30 13:24:08 +01:00
Anatol Belski 15f2db3370 append latest PHP 5 NEWS 2015-11-30 12:54:26 +01:00
Anatol Belski f2f7064f4c merge NEWS for final 2015-11-30 12:51:54 +01:00
Anatol Belski 3d12e9f1a3 sync NEWS 2015-11-27 11:08:39 +01:00
Xinchen Hui 1561fbad67 Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) 2015-11-27 11:04:06 +01:00
Christopher Jones 59d15ce9d4 Fix remaining gcov valgrind issues 2015-11-25 03:20:22 +01:00
Anatol Belski 030a97cb13 sync NEWS 2015-11-25 03:17:30 +01:00
Xinchen Hui 22fdc95e5e Also fixed 'r' 2015-11-25 03:17:17 +01:00
Xinchen Hui 57251853e7 Indent (not sure why it was messed) 2015-11-25 03:17:13 +01:00
Xinchen Hui aa4747c407 Fixed bug #70963 (Unserialize shows UNKNOW in result)
Thanks to ryat for reportinig
2015-11-25 03:14:34 +01:00
Anatol Belski ea7d6bdc42 sync NEWS 2015-11-25 03:13:14 +01:00
Xinchen Hui 254e709484 Fixed bug #70959 (ArrayObject unserialize does not restore protected fields) 2015-11-25 03:11:26 +01:00
Xinchen Hui 8b52a8edbe Add test for bug (count on symbol table)
I should have do this ....
2015-11-25 02:50:20 +01:00
Anatol Belski bb5a0ad363 fix wrong bug number 2015-11-25 02:49:51 +01:00
Anatol Belski 22cc3e228f update NEWS 2015-11-24 21:17:18 +01:00
Anatol Belski 5bd117a542 Revert "Merge branch 'PHP-5.6' into PHP-7.0"
This reverts commit 7d2a26b3fd.
2015-11-24 21:02:54 +01:00
Anatol Belski 74413fe757 Revert "Port the fix of 5.6 to 7.0"
This reverts commit c2f7fadee2.
2015-11-24 21:02:26 +01:00
Anatol Belski dd756ae683 sync news entry 2015-11-24 20:49:48 +01:00
Anatol Belski 386e987c8d set release date 2015-11-24 20:48:48 +01:00
Anatol Belski c74427e184 bump versions 2015-11-24 20:45:23 +01:00
Xinchen Hui 067f3125a6 Improved fix for bug (count on symbol table) 2015-11-24 20:38:42 +01:00
Xinchen Hui d749cd9b04 Fixed bug (count on symbol tables) 2015-11-24 20:38:34 +01:00
Xinchen Hui c2f7fadee2 Port the fix of 5.6 to 7.0 2015-11-21 18:28:04 +01:00
Xinchen Hui 7d2a26b3fd Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	Zend/tests/bug70944.phpt
	Zend/zend_exceptions.c
2015-11-21 18:27:43 +01:00
Xinchen Hui e4d1ac2c0f Improved previously fix a little 2015-11-21 17:48:41 +01:00
Anatol Belski 855cf743ab sync NEWS 2015-11-21 17:47:52 +01:00
Xinchen Hui 597ed66ade Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED) 2015-11-21 17:47:15 +01:00
Anatol Belski 8ae48067b8 sync NEWS 2015-11-19 19:27:27 +01:00
Xinchen Hui cbb3f7f15a Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	Zend/zend_exceptions.c
2015-11-19 19:25:05 +01:00
Xinchen Hui 01b88f87ba Merge branch 'PHP-5.6' into PHP-7.0 2015-11-19 19:24:06 +01:00
Xinchen Hui 0c9bb33c2c Merge branch 'PHP-5.6' into PHP-7.0 2015-11-19 19:23:35 +01:00
Anatol Belski da8d01316c add things merged so far to NEWS 2015-11-19 17:28:15 +01:00
Remi Collet 0e2d72560a Fixed bug #70940 Segfault in soep / type_to_string 2015-11-19 17:20:28 +01:00
Christopher Jones 62ef34da4e Fixed LOB mem leak reported on gcov. Also fixed unsigend comparison compile warning; and remove direct field access 2015-11-17 13:20:37 +01:00
Anatol Belski 27742dc6e8 Fixed bug #70917 install-pear-nozlib.phar missing
The actual bug is caused by some network error while packaged. An
error check added to interrupt the packaging process if phar package
download failed.
2015-11-17 13:19:59 +01:00
Thorsten Rinne 03b0733a49 Added support for CSS/JavaScript source maps
Source maps (http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/) are basically a way to map a combined/minified file back to an unbuilt state. To avoid error messages in Browser DevTools, source map files should be served with the MIME type "application/json"
2015-11-17 13:19:47 +01:00
Anatol Belski b29f1dba43 fix test title
c/p mistake :)
2015-11-17 13:18:55 +01:00
Taoguang Chen 327b8bf79c Fixed bug #70914 zend_throw_or_error() format string vulnerability 2015-11-17 13:17:00 +01:00
Xinchen Hui 2aa400a0ff Fixed bug #70910 (extract() breaks variable references) 2015-11-17 13:15:44 +01:00
Xinchen Hui 815e456a7a Fixed bug #70912 (Null ptr dereference instantiating class with invalid array property) 2015-11-17 13:14:30 +01:00
Yasuo Ohgaki 04d99b3433 Use distinguishable error messages. 2015-11-17 13:13:28 +01:00
Dmitry Stogov 14d8216404 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-17 13:11:05 +01:00
Xinchen Hui cbc912d3ad Ensure the test fails 2015-11-17 13:10:15 +01:00
Anatol Belski 3c43ef2b16 add test for bug #70898 2015-11-17 13:09:39 +01:00
Xinchen Hui ed291d40d9 Also protects this one 2015-11-17 13:08:39 +01:00
Xinchen Hui 83bf7ec406 Re-fixed #70895 2015-11-17 13:05:14 +01:00
Anatol Belski 3183ece929 sync NEWS 2015-11-11 10:59:11 +01:00
Xinchen Hui 524d777188 Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
Let's fixed this in the root instead
2015-11-11 10:58:36 +01:00
Reeze Xia 7beb0d449f C99 complain fix 2015-11-11 10:56:56 +01:00
Dmitry Stogov 2f8b6ebddc Fixed incorrect order of free/finally on exception 2015-11-10 12:09:45 +01:00
Dmitry Stogov 17d9bc9222 Added tests 2015-11-10 12:09:30 +01:00
Anatol Belski bf9d2d47d8 additional catch to bug #70863 2015-11-10 00:47:55 +01:00
Xinchen Hui 78ccf76822 Fixed bug #70624 opcache.huge_code_pages 2015-11-08 09:49:19 +01:00
Colin O'Dell 88790a3607 Fix description of a BC break 2015-11-08 09:48:34 +01:00
Xinchen Hui 3b5d5caf14 manually apply the typo fix in master 2015-11-08 09:48:07 +01:00
Lynn fbfc4e930d rm duplicate include 2015-11-08 09:47:48 +01:00
James Titcumb dc6b74ae2d Fixed typo in reflection phpt 2015-11-08 09:47:26 +01:00
Nikita Popov 3c05c82a19 Fix various update_opN_const issues 2015-11-08 09:47:11 +01:00
Nikita Popov 788aaafaff Refactor update_op2_const
Combines both switches into one, to avoid having to maintain the same
opcode list twice. This also makes most of the bugs fixed by the next
commit pretty obvious.

No functional change here.
2015-11-08 09:46:59 +01:00
Nikita Popov e5072a7841 Don't propagate into ops that error on non-string
To properly support this make update_opN_const fallible -- they
are not always called through replace_with_const.
2015-11-08 09:45:00 +01:00
Nikita Popov e4f7dd720e Strip leading backslash in update_opN_const 2015-11-08 09:44:10 +01:00
Nikita Popov 45a9d15897 Fix update_opX_const lowercasing
It was lowering in-place.
2015-11-08 09:43:57 +01:00
Xinchen Hui 40e5e54713 Use defined macro 2015-11-08 09:31:28 +01:00
Anatol Belski 33b9f70e95 sync NEWS 2015-11-08 09:29:10 +01:00
Felipe Pena 23e625b3ad Fixed bug #70678 (PHP7 returns true when false is expected)
Cherry-pick from master.
2015-11-08 09:27:41 +01:00
Anatol Belski 320afaee32 add missing news entry 2015-11-08 09:26:21 +01:00
Christopher Jones 9bc819d943 Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil) 2015-11-08 09:20:33 +01:00
Anatol Belski 3c8fac95b0 bump version 2015-11-08 07:17:22 +01:00
Anatol Belski bf791f4744 sync NEWS 2015-11-08 06:37:27 +01:00
Xinchen Hui 10cd3b69f8 Fixed bug #70873 (Regression on private static properties access) 2015-11-08 06:36:40 +01:00
Anatol Belski 36e35b9a23 sync NEWS 2015-11-08 06:10:48 +01:00
Matteo Beccati 1522b898b0 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-08 06:08:38 +01:00
Anatol Belski 769343d7be sync NEWS 2015-11-08 06:07:11 +01:00
Xinchen Hui 1cada8e050 Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults) 2015-11-08 06:05:41 +01:00
Anatol Belski 94c9f54f16 sync NEWS 2015-11-08 05:14:18 +01:00
Caleb Champlin 5645bbb9db Make sure context is set to null to prevent use after free 2015-11-08 05:13:31 +01:00
Anatol Belski d61b7a6de4 sync NEWS 2015-11-08 04:37:22 +01:00
Xinchen Hui 22d3033ec6 Fixed bug #70876 (Segmentation fault when regenerating session id with strict mode) 2015-11-08 04:36:22 +01:00
Anatol Belski 7d398b1fa8 sync NEWS 2015-11-08 04:30:21 +01:00
Anatol Belski da296e2cd0 fix decrement_function regarding bug #70863 2015-11-08 04:29:23 +01:00
Anatol Belski 68910e314f Fixed bug #70863 Incorect logic to increment_function for proxy objects 2015-11-08 04:29:11 +01:00
Anatol Belski 4b48b29718 no more dev ZEND_VERSION 2015-11-08 04:28:50 +01:00
Anatol Belski 35746aba3e sync NEWS 2015-11-08 04:28:14 +01:00
Xinchen Hui 3d8c4a37a5 Fixed bug #70868 (PCRE JIT and pattern reuse segfault) 2015-11-08 04:27:25 +01:00
Márcio Almada 973a64e17d add failing test for bug #70868 2015-11-08 04:27:10 +01:00
Anatol Belski c1119e31f7 sync NEWS 2015-11-08 04:26:40 +01:00
Anatol Belski b6fc98b833 fix NULL deref in mbstring post handler 2015-11-08 04:24:40 +01:00
Anatol Belski 7554b10a77 fix NULL deref in pdo_firebird
ref #70862
2015-11-08 04:24:29 +01:00
Anatol Belski 12208dc8fc fix pdo_sqlite crash with empty bound stream 2015-11-08 04:24:16 +01:00
Anatol Belski 5fad120885 fix leak 2015-11-08 04:24:04 +01:00
Anatol Belski 682dae60dd fix pdo_mysql crash with empty bound stream param
rel #70862
2015-11-08 04:23:51 +01:00
Anatol Belski 75807f7b00 add test for bug #70861 2015-11-08 04:23:39 +01:00
Anatol Belski 7f3ba1fe6f fix possible NULL deref in image functions 2015-11-08 04:23:26 +01:00
Anatol Belski 352117b728 fix crash in sqlite when executing with bound stream param
rel #70862
2015-11-08 04:23:10 +01:00
Fabian Franz 3bdb7cf56c Fix setting of empty string resource. 2015-11-08 04:22:51 +01:00
Anatol Belski 84abd7f7bd update the actual sql parser file for #70861 2015-11-08 04:22:31 +01:00
Anatol Belski 602e57e1c6 Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite 2015-11-08 04:22:18 +01:00
Anatol Belski 40326fef9d sync NEWS 2015-11-08 04:18:58 +01:00
Xinchen Hui b48738f00b Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index) 2015-11-08 03:25:49 +01:00
Anatol Belski aa5c9f932a sync NEWS 2015-11-08 03:23:53 +01:00
Xinchen Hui 849ef6db44 Fixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1) 2015-11-08 03:21:35 +01:00
Anatol Belski ee7e5533e8 sync NEWS 2015-11-08 02:55:51 +01:00
Xinchen Hui 46bb5a8cc9 Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite) 2015-11-08 02:55:02 +01:00
Xinchen Hui 20b773438d Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms) 2015-11-08 02:54:24 +01:00
Xinchen Hui ddda9b3455 Add test_fpm_conf to skip some tests ranth than mark --xfail-- 2015-11-08 02:48:53 +01:00
Anatol Belski 589bd6bc6c sync NEWS 2015-11-08 02:33:32 +01:00
Xinchen Hui c600bdcb79 Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use) 2015-11-08 02:32:58 +01:00
Dmitry Stogov b29501f587 Fixed incomplete initialization. 2015-11-08 02:28:04 +01:00
Anatol Belski 17c1fe254c sync NEWS 2015-11-08 02:22:12 +01:00
Xinchen Hui 51f9948b2b Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)
I knew, this fix seems ugly
2015-11-08 02:17:20 +01:00
Dmitry Stogov ae79c52c12 Fix frequent reallocations with many small strings 2015-10-27 09:52:43 +01:00
Dmitry Stogov 579f10c0a1 Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs). 2015-10-27 02:23:49 +01:00
Anatol Belski c031d6de68 sync NEWS 2015-10-27 02:23:17 +01:00
Xinchen Hui f5431a6483 Fixed bug #70785 (Infinite loop due to exception during identical comparison) 2015-10-27 02:22:30 +01:00
Dmitry Stogov 5bfade4d40 Fixed incorrect "peak" memory consumption calculation. 2015-10-27 02:20:54 +01:00
Anatol Belski a3af1b664b sync NEWS 2015-10-24 13:33:32 +02:00
Nikita Popov 2e7290f046 Fix bug #70782 2015-10-24 13:32:17 +02:00
Anatol Belski 073e155f4e bump version 2015-10-23 11:52:54 +02:00
Anatol Belski 6234e16611 rather use the supplied inttypes.h with vc14 2015-10-23 11:39:48 +02:00
Xinchen Hui 64c52c805f Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler"
read: http://news.php.net/php.internals/88887

This reverts commit 808f62bb4d.
2015-10-23 11:38:13 +02:00
Xinchen Hui bbabab1cdc Regenerate zend_ini_scanner.c 2015-10-23 11:37:53 +02:00
Anatol Belski 06db864426 sync news 2015-10-23 11:37:32 +02:00
Xinchen Hui 09b5aef876 Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	Zend/zend_ini_scanner.c
2015-10-23 11:36:11 +02:00
Anatol Belski 1e6195c6bc sync NEWS 2015-10-23 11:10:35 +02:00
Xinchen Hui 8836fdd4ed Fixed bug #70730 (Incorrect ArrayObject serialization if unset is called in serialize())
It's possible to fixed this in SPL side, but it will be ugly, and we
should make serialize more robust, so I prefer fix it in serialize side.
2015-10-23 11:09:42 +02:00
Anatol Belski b01a607d73 sync NEWS 2015-10-23 10:42:08 +02:00
Xinchen Hui 1f677c5eff Fixed bug #70715 (Segmentation fault inside soap client) 2015-10-23 10:41:33 +02:00
Bob Weinand 959d93086a Prevent memcmp() result truncation
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt
2015-10-23 10:37:15 +02:00
Anatol Belski 8d5904f10f sync NEWS 2015-10-18 13:46:18 +02:00
Anatol Belski 980a2c283d Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  C89 compat
  use spprintf instead (no need to estrdup afterwards).
  dblib's dbcolname can return null in some cases
  testcase fot bug #69757
  Segmentation fault on pdo_dblib::nextRowset (bug #69757)

Conflicts:
	ext/pdo_dblib/dblib_stmt.c
2015-10-18 13:43:53 +02:00
Anatol Belski 209015012f sync NEWS 2015-10-18 12:45:01 +02:00
Xinchen Hui 74004a160d Fixed bug #70724 (Undefined Symbols from opcache.so on Mac OS X 10.10) 2015-10-18 12:43:08 +02:00
Anatol Belski 294c3cdbdc sync NEWS 2015-10-18 12:42:32 +02:00
Nikita Popov 5576aee84f Fixed bug #70430 2015-10-18 12:41:26 +02:00
Nikita Popov d449c527bc Reindent zend_yytnamerr
Separating this whitespace change from the next diff.
2015-10-18 12:41:26 +02:00
Anatol Belski 63730a6981 sync NEWS 2015-10-18 12:39:08 +02:00
Xinchen Hui c5d5aacc79 Fixed bug #70689 (Exception handler does not work as expected) 2015-10-18 12:38:22 +02:00
Anatol Belski f6e2a1f9b9 update NEWS 2015-10-18 12:38:15 +02:00
Xinchen Hui b3cf4a2dc0 Fixed Conditional jump or move depends on uninitialised value 2015-10-18 12:36:16 +02:00
Xinchen Hui 332cf3cf56 Fixed bug #70709 (SOAP Client generates Segfault) 2015-10-18 12:32:05 +02:00
Bob Weinand 1b5b21539f Do not create a fake Closure for real Closures
That is solved by just returning the Closure as is, which is safe due to Closures being immutable objects
2015-10-14 16:15:27 +02:00
Anatol Belski 666db28ef2 update UPGRADING 2015-10-13 11:50:28 +02:00
Anatol Belski 2fbfd6f5a7 sync NEWS 2015-10-13 10:40:16 +02:00
Anatol Belski 47595abd40 bump RC version 2015-10-13 10:38:59 +02:00
Anatol Belski 0b27669c5a update libs_versions.txt 2015-10-13 10:37:57 +02:00
Anatol Belski 40142c084a Merge branch 'PHP-7.0' into PHP-7.0.0
* PHP-7.0: (103 commits)
  Add more tests for closure binding
  Forbid "fake" closure rebinding
  increase API versions
  fork test for ICU 56.1
  fork test for ICU-56.1
  fix test for ICU-56.1
  fix test
  Double declaration
  fix stack overflow
  Generally run all tests in sapi folder by default
  Fixed bug #70685
  Normalize rebinding failures
  Implemented file_cache_fallback mechanism
  Improve previous fix
  Fixed bug #70681
  update NEWS
  update NEWS
  Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
  Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
  Fixed infinity recurion if we create closure on top of other closure.
  ...
2015-10-13 10:29:26 +02:00
Nikita Popov 7597a06562 Add more tests for closure binding 2015-10-12 20:37:14 +02:00
Dmitry Stogov 23b372d358 Forbid "fake" closure rebinding 2015-10-12 20:34:08 +02:00
Anatol Belski dcbbf7c38d increase API versions 2015-10-12 20:17:22 +02:00
Anatol Belski 5492fe9f25 fork test for ICU 56.1 2015-10-12 11:20:51 +02:00
Anatol Belski aea420c7cf fork test for ICU-56.1 2015-10-12 11:16:27 +02:00
Anatol Belski 3fb6f0014a fix test for ICU-56.1 2015-10-12 11:10:04 +02:00
Matteo Beccati 474a2e01eb Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix test
2015-10-12 09:47:02 +02:00
Anatol Belski d160e98feb fix test 2015-10-12 09:46:52 +02:00
Xinchen Hui 8732ead953 Double declaration 2015-10-12 10:42:04 +08:00
Anatol Belski 4224907864 fix stack overflow 2015-10-10 18:37:16 +02:00
Bob Weinand fe67696867 Generally run all tests in sapi folder by default
Turned out that sapi/phpdbg actually wasn't explicitly included as sapi folders were individually selected
2015-10-10 17:24:14 +02:00
Nikita Popov c85ad5d0be Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	Zend/zend_closures.c
2015-10-10 15:00:41 +02:00
Nikita Popov d7d01fc9a3 Fixed bug #70685
Doing a less intrusive variant of the PHP 7.0 fix for 5.6.
2015-10-10 14:59:21 +02:00
Nikita Popov 4b821f0fc6 Normalize rebinding failures
Move all rebinding checks into one function to make sure they stay
in sync. Normalize return value to be NULL for all rebinding
failures, instead of returning an improperly bound closure in some
cases.
2015-10-10 13:56:36 +02:00
Anatol Belski ffb5d0aca3 Implemented file_cache_fallback mechanism
which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.

This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!
2015-10-09 23:47:59 +02:00
Nikita Popov d677b25b1c Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:28:58 +02:00
Nikita Popov e19423f3cb Improve previous fix
Don't forbid null binding on plain functions.
2015-10-09 23:28:24 +02:00
Nikita Popov f6ae19f158 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:06:32 +02:00
Nikita Popov bbae7ddf29 Fixed bug #70681 2015-10-09 23:01:23 +02:00
Anatol Belski be09d1c262 update NEWS 2015-10-09 12:36:40 +02:00
Anatol Belski d468390353 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  fix coverage report for datelib
2015-10-09 12:35:48 +02:00
Anatol Belski 505c9c3742 update NEWS 2015-10-09 12:35:06 +02:00
Dmitry Stogov 0847681b1a Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure()) 2015-10-09 11:48:13 +03:00
Dmitry Stogov c6af0aa33f Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures) 2015-10-09 02:39:07 +03:00
Dmitry Stogov 93748bf9dd Fixed infinity recurion if we create closure on top of other closure. 2015-10-09 02:37:51 +03:00
Dmitry Stogov 05bd331c6a Fixed use after free 2015-10-09 01:09:22 +03:00
Dmitry Stogov 91fb3a7b27 Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions) 2015-10-09 00:45:02 +03:00
Andrea Faulds fa23bebe94 Correct intdiv() argument names and description 2015-10-08 15:45:22 +01:00
Dmitry Stogov 3815e97136 Fixed bug #70668 (array_keys() doesn't respect references when $strict is true) 2015-10-08 14:59:02 +03:00
Dmitry Stogov 9af07e7119 Fixed bug #70667 (strtr() causes invalid writes and a crashes) 2015-10-08 14:30:43 +03:00
Nikita Popov cc3c425af8 Fix bug #70662
This replaces add_new with update for the RW case. This should not
be problematic for performance, as this branch throws a notice.

Alternatively add_new could also be replaced with add. I went with
update, because it makes $a[0] += 1 behavior the same as
$a[0] = $a[0] + 1.
2015-10-08 11:03:39 +02:00
Márcio Almada ddb6d7801e Fix bug #70650 2015-10-07 16:25:59 +02:00
Ferenc Kovacs f9e3461c02 pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
Dmitry Stogov 5d2813edce Fixed test.
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:09:37 +03:00
Christopher Jones 19e461b07d Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
2015-10-07 20:27:38 +11:00
Christopher Jones 4a57f1821b Fix mem leak and improve test portability (Senthil) 2015-10-07 20:24:49 +11:00
Dmitry Stogov ccb677ece8 Fixed test running on MarinaDB. 2015-10-07 12:21:43 +03:00
Anatol Belski c0ca731d7a add comment to test 2015-10-07 09:43:28 +02:00
Dmitry Stogov b8b335c492 Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt. 2015-10-07 04:26:26 +03:00
Dmitry Stogov 91588a98be Fixed test (system error messages may be different). 2015-10-07 03:25:12 +03:00
Dmitry Stogov abf3c2f796 Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck). 2015-10-07 03:08:11 +03:00
Dmitry Stogov 424a26d5d4 Split test into different versions for 32-bit and 64-bit systems 2015-10-07 01:51:37 +03:00
Dmitry Stogov 2c92f33b1d Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
  Drop HAVE_PACKED_OBJECT_VALUE
  More zpp cleanup in ext/intl
2015-10-07 01:48:11 +03:00
Nikita Popov cd2b0a7bb8 Drop HAVE_PACKED_OBJECT_VALUE
This check doesn't make sense anymore, we have no object_value
anymore.
2015-10-06 23:12:34 +02:00
Dmitry Stogov e0b3b3c752 Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())"
This reverts commit 517b553625.
2015-10-06 23:59:36 +03:00
Nikita Popov 0a3c1fb4c2 More zpp cleanup in ext/intl 2015-10-06 22:58:02 +02:00
Dmitry Stogov e193d35c1e Revert "Improve 517b55362 (scope rebinding on method Closures)"
This reverts commit 881c502520.
2015-10-06 23:48:15 +03:00
Dmitry Stogov 24e88348f3 Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src"
This reverts commit a6be0f3fd6.
2015-10-06 23:48:12 +03:00
Dmitry Stogov 524d00e005 Revert "Allow random $this on non-internal Closures again"
This reverts commit 35d0405c47.
2015-10-06 23:48:10 +03:00
Dmitry Stogov 3c0348056a Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"
This reverts commit 8c33bdb976.
2015-10-06 23:48:08 +03:00
Dmitry Stogov 5a49ac77aa Revert "Speed up self::$property access by 20%"
This reverts commit 0fbd3e5fe7.
2015-10-06 23:48:04 +03:00
Dmitry Stogov 1198c5d8bb Revert "Update NEWS"
This reverts commit 60bb51c0d3.
2015-10-06 23:47:49 +03:00
Sara Golemon a2082b7c97 Add some tests for unserialize() class filtering 2015-10-06 12:04:11 -07:00
Rasmus Lerdorf fb2c890c2c zend.assertions is not a boolean 2015-10-06 17:13:38 +09:00
Bob Weinand 60bb51c0d3 Update NEWS 2015-10-06 01:03:04 +02:00
Scott 63617a678f Fixed bug #70641 (Random_* - Better compatibility on Linux distros)
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-145571829
2015-10-06 01:03:04 +02:00
Anatol Belski d5bd999a8f don't leak handles 2015-10-05 21:59:26 +02:00
Anatol Belski 3331d870aa use correct function to close handles 2015-10-05 21:59:22 +02:00
Bob Weinand 0fbd3e5fe7 Speed up self::$property access by 20% 2015-10-05 21:52:09 +02:00
Bob Weinand 8c33bdb976 Speed up self::method() calls (no ZEND_FETCH_CLASS) 2015-10-05 21:16:52 +02:00
Bob Weinand 35d0405c47 Allow random $this on non-internal Closures again
As it turns out, there is actually no reason to prevent this, it even was a bigger BC break than expected...

Also fixes a memory leak (the Closure leaks) when calling internal functions via Closure by moving it out of leave helper onto caller side for TOP_CODE:

$z = new SplStack; $z->push(20);
$x = (new ReflectionMethod("SplStack", "pop"))->getClosure($z);
var_dump($x());
2015-10-05 17:49:32 +02:00
Bob Weinand a6be0f3fd6 Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src 2015-10-05 14:50:04 +02:00
Bob Weinand 881c502520 Improve 517b55362 (scope rebinding on method Closures)
Now it is completely impossible to rebind a scoped method Closure (only the kind you get from ReflectionMethod::getClosure()) to a foreign scope
Adding a lot of tests to ensure this...
Also, properly return NULL in case the Closure could not be created instead of some crippled unbound Closure
2015-10-05 00:56:55 +02:00
Anatol Belski a549a3ac17 improve error message 2015-10-04 16:36:53 +02:00
Anatol Belski c97198e181 fix incrementing on 32-bit 2015-10-04 12:19:16 +02:00
Nuno Lopes 052dd3005b fix coverage report for datelib 2015-10-04 05:45:05 -04:00
Nuno Lopes ba4a85b012 fix coverage report for datelib 2015-10-04 05:39:01 -04:00
Xinchen Hui 2a54b02257 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 23:16:38 -07:00
Xinchen Hui 2fb8bb1157 Fixed bug #70632 (Third one of segfault in gc_remove_from_buffer) 2015-10-03 20:33:24 -07:00
Xinchen Hui 6876112c89 Fixed the third one of (segfault in gc_remove_from_buffer())
This one maybe only used in debug mode, so no bug report and no test
script provided
2015-10-03 20:15:35 -07:00
Xinchen Hui 4744eec753 Fixed bug #70631 (Another Segfault in gc_remove_from_buffer()) 2015-10-03 20:08:21 -07:00
Xinchen Hui 925412ee1c Do not edit the zval cause it might be in shared memory 2015-10-03 19:50:38 -07:00
Xinchen Hui c147d90dbf Fixed bug #70601 (Segfault in gc_remove_from_buffer()) 2015-10-03 19:38:56 -07:00
Bob Weinand 517b553625 Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
This additionally removes support for binding to an unknown (not in parent hierarchy) scope.
Removing support for cross-scope is necessary for certain compile-time assumptions (like class constants) to prevent unexpected results
2015-10-04 01:38:59 +02:00
Anatol Belski 4cb6342426 remove useless checks
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
2015-10-03 10:57:32 +02:00
Anatol Belski 96fe3be7f2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix win10 support
2015-10-03 10:46:10 +02:00
Anatol Belski 83bef0ef83 fix win10 support
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
2015-10-03 10:44:43 +02:00
Nikita Popov e892e2e253 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 10:13:44 +02:00
Nikita Popov fe1933aae2 Fixed bug #70625 2015-10-03 10:12:11 +02:00
Ferenc Kovacs b2988714aa Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Update NEWS file with LDAP fixes
2015-10-02 21:51:13 +02:00
Ferenc Kovacs 6f895a29c9 Merge branch 'pr-1544' into PHP-5.6
* pr-1544:
  Update NEWS file with LDAP fixes
2015-10-02 21:48:33 +02:00
Derick Rethans a2f5619303 Updated to version 2015.7 (2015g) 2015-10-02 18:12:18 +01:00
Derick Rethans 60b5487897 Empty merge 2015-10-02 18:12:18 +01:00
Derick Rethans c08824fd72 Updated to version 2015.7 (2015g) 2015-10-02 18:12:16 +01:00
Xinchen Hui d6c9dc719e PHP7 is not affected 2015-10-02 07:26:04 -07:00
Xinchen Hui 83fea9461e Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/date/php_date.c
2015-10-02 07:21:07 -07:00
Xinchen Hui c98ea8465b Fixed bug #70619 (DateTimeImmutable segfault) 2015-10-02 07:19:21 -07:00
Bob Weinand 8285731362 Fix parse errors in -rr mode 2015-10-02 12:51:32 +02:00
Bob Weinand 4f90e2ec9d Ensure proper set_exception_handler() handling with exit() inside it 2015-10-02 12:37:40 +02:00
Bob Weinand 0c03ba0ad0 Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions) 2015-10-02 12:37:40 +02:00
Bob Weinand 32337d35cc Do not display memory leaks on fatal 2015-10-02 12:37:40 +02:00
Bob Weinand 6c61286da4 Do not include zend_verify_return_type in executable ops (phpdbg) 2015-10-02 12:37:39 +02:00
Nikita Popov 1287c48082 Fix/improve zpp usage
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
Nikita Popov 1a39b6e3c0 More check_parameters improvements
* Switch default REPORT_LEVEL to 1 to cut down on the noise
* Make initialization of 'C' variable always required
* Don't require init of lLdb variable if ! is used
* Don't throw error about missing init of not detected parameters
  (This was a regression in the last changeset)
* Support method_parameters and throw variations
2015-10-02 09:05:39 +02:00
Nikita Popov 5c1b627458 More check_parameters improvements
* Allow / on everything but lLdb (on which it will work, but makes
  no sense).
* For ! on lLdb add additional zend_bool* parameter.
* For optional s and p only require one of the variables to be
  initialized. The length is usually not initialized.
2015-10-01 20:42:57 +02:00
Sean DuBois 06dde16a6a Update scripts/dev/check_parameters.php for PHP 7
Also fix deprecation errors and move from preg_replace
-> preg_replace_callback.
2015-10-01 20:08:05 +02:00
Nikita Popov 8557e8323a Remove checks for read_property retval being NULL
read_property uses &EG(uninitialized_zval) instead.
2015-10-01 16:33:30 +02:00
Nikita Popov c25e81ab7b Remove dead assignment in get_property_guard 2015-10-01 16:28:28 +02:00
Matteo Beccati 8039063d95 ReflectionGenerator and ReflectionType are new classes
I've added them to the new classes paragraph for the sake of completeness, even
though they are mentioned before as new features.
2015-09-30 15:50:01 +02:00
Antony Dovgal 99d5634079 fix dl() function
..which was using old macro
2015-09-30 14:40:29 +01:00
Dmitry Stogov 64a79817ce Reordered field to improve data lacality and reduce L1D CPU cache misses in ZEND_INIT_FCALL opcode family 2015-09-30 16:22:56 +03:00
Julien Pauli a60105d7a4 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed test
  5.5.31 now
2015-09-30 13:19:37 +02:00
Julien Pauli 0fd71d1184 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
	configure.in
	main/php_version.h
2015-09-30 13:19:18 +02:00
Julien Pauli d7fb43e30d Fixed test 2015-09-30 13:18:16 +02:00
Julien Pauli 3f08fc0466 5.5.31 now 2015-09-30 13:01:11 +02:00
Bob Weinand ba6d193b4c Add NTS/ZTS information to php -v 2015-09-30 12:39:09 +02:00
Anatol Belski 3e74df74f9 fix test 2015-09-30 12:18:32 +02:00
Anatol Belski 59541795e2 fork test 2015-09-30 11:13:29 +02:00
Anatol Belski e80306cbe8 fix tests on Windows 2015-09-30 11:13:28 +02:00
Anatol Belski 353d996c9f tweak cgi binary search 2015-09-30 11:13:27 +02:00
Andrey Hristov 07a8e5ce37 Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now). 2015-09-30 09:03:35 +02:00
Xinchen Hui df1a99d9a4 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-30 12:59:45 +08:00
Andrey Hristov 7b787ebbb6 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-30 09:04:00 +02:00
Richard Quadling 64990642cf Spelling
bugger => buffer
2015-09-30 12:59:16 +08:00
Xinchen Hui 11baa1b672 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-30 10:41:54 +08:00
Xinchen Hui 45cb42f49f Simply use 0/1 instead as dmitry suggested 2015-09-30 10:41:27 +08:00
Ferenc Kovacs 70e6bf03bf Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
2015-09-30 01:35:35 +02:00
Ferenc Kovacs 0c10e10ee8 update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release 2015-09-30 01:28:39 +02:00
Ferenc Kovacs 6d9f12d0b3 add NEWS entries 2015-09-30 01:17:40 +02:00
Ferenc Kovacs f8ec1d922e Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add NEWS entries
  add NEWS entries
2015-09-30 01:17:10 +02:00
Ferenc Kovacs 264f33a23f add NEWS entries 2015-09-30 01:16:43 +02:00
Ferenc Kovacs 62ff2d0bfe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add NEWS entries
2015-09-30 01:15:54 +02:00
Ferenc Kovacs 932f707177 add NEWS entries 2015-09-30 01:15:24 +02:00
Xinchen Hui df2ff75116 Make ZEND_ECHO and removed ZEND_PRINT distinguishable 2015-09-29 21:50:15 +08:00
Anatol Belski 417e58f332 fix NEWS 2015-09-29 15:01:27 +02:00
Anatol Belski 459e20eec0 Merge branch 'PHP-7.0' into PHP-7.0.0
* PHP-7.0:
  Added information about Zend Extension API chabges
  fix test
  Ensure timeout tests wait for the entire specified duration
  Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information. We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space for zend_function union, and extensions were able to reuse zend_function.op_array.reserved[] even for internal function. Now this is not possible. And extensions have to use zend_function.op_array.reserved[] for user functions and zend_function.internal_function.reserved[] for internal.
  update NEWS for next
  Update openssl_x509_checkpurpose.phpt
  add test to openssl ext
2015-09-29 13:54:21 +02:00
Anatol Belski c30937d2bd fix test 2015-09-29 13:16:29 +02:00
Dmitry Stogov 27d4d32e6b Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
  fix test
  Ensure timeout tests wait for the entire specified duration
2015-09-29 14:11:39 +03:00
Dmitry Stogov 27a5f66da4 Added information about Zend Extension API chabges 2015-09-29 14:08:03 +03:00
Anatol Belski bfd2637068 fix test 2015-09-29 13:04:06 +02:00
Steven Hilder 24bb5698af Ensure timeout tests wait for the entire specified duration 2015-09-29 13:04:05 +02:00
Dmitry Stogov ca36b7bc13 Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information.
We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space for zend_function union, and extensions were able to reuse zend_function.op_array.reserved[] even for internal function. Now this is not possible. And extensions have to use zend_function.op_array.reserved[] for user functions and zend_function.internal_function.reserved[] for internal.
2015-09-29 13:31:47 +03:00
Anatol Belski 5531d4492e update NEWS for next 2015-09-29 10:51:23 +02:00
Anatol Belski c6b9ee82a4 bump versions 2015-09-29 10:49:27 +02:00
marcosptf dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Anatol Belski dd1b80e48f Merge branch 'PHP-7.0' into PHP-7.0.0
* PHP-7.0: (129 commits)
  Removed or simplified incorrect SEPARATE_*() macros usage.
  Add upgrading info about the tick functions internal API change
  Remove makedev() check.
  Different error message if makedev check fails
  Add support for getrandom(2), add type check on file descriptor
  fix test
  Better fix for bug #70433
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
  Fix bug #70480 (php_url_parse_ex() buffer overflow read)
  Add support for parameters to tick functions, on C level. This is only for extensions that want to use register tick functions. Userland tick functions are unaffected.
  Add NEWS entry for #70533 (credits to Anatol)
  fix phpdbg's -h switch
  Fixed bug #70572 segfault in mysqlnd_connect
  Spread the news about 70384
  Allow an experimental VM with tail call dispatch technique (disabled by default). This VM may work only if all tail calls are optimized, otherwaise it will crach because of stack overflow. Unfortunately, we can't guarantee tail call optimization in C.
  check for test requirement
  fix data type and warning
  Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[])
  ...
2015-09-29 10:32:22 +02:00
Dmitry Stogov 560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Andrey Hristov 617bef558b Add upgrading info about the tick functions internal API change 2015-09-29 09:48:49 +02:00
Scott 694b9af5b6 Remove makedev() check. 2015-09-29 09:14:30 +02:00
Scott 46aa628605 Different error message if makedev check fails 2015-09-29 09:14:29 +02:00
Scott 6554f721f7 Add support for getrandom(2), add type check on file descriptor
Fix to_read, throw exception if syscall fails

Fixes thanks to feedback from sarnold at ##crypto on freenode

Correction on error conditions

Remove dead code (thanks @defuse)

It turns out getrandom can take >256, getentropy refuses.

Better semantics

Thanks @defuse for catching my silly mistake here

Cast to size_t to be explicit

Let's simplify the logic a bit

Let's be consistent; define everything before we do any logic

Continuously check that the file descriptor is still a valid one

Add device type check on fd initialization
2015-09-29 09:14:28 +02:00
Anatol Belski 208ed0a010 fix test
cutting out the '/' is not critical, but allows to avoid forking
2015-09-29 09:11:52 +02:00
Stanislav Malyshev d6e8426ebf Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
	ext/phar/util.c
2015-09-28 21:43:16 -07:00
Stanislav Malyshev 2e267bd3c7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
2015-09-28 21:42:08 -07:00
Stanislav Malyshev 1ddf72180a Better fix for bug #70433 2015-09-28 21:41:02 -07:00
Stanislav Malyshev 4c6f4863fa Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
2015-09-28 20:45:02 -07:00
Stanislav Malyshev 51b23cd0f0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
2015-09-28 20:44:28 -07:00
Stanislav Malyshev f98ab19dc0 fix memory leak 2015-09-28 20:43:18 -07:00
Stanislav Malyshev e78ac461db FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" 2015-09-28 17:12:35 -07:00
Stanislav Malyshev e7574a5329 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

Conflicts:
	ext/phar/util.c
2015-09-28 17:00:32 -07:00
Stanislav Malyshev f39a4ee0c9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
2015-09-28 16:59:46 -07:00
Stanislav Malyshev d698f0ae51 Fix bug #69720: Null pointer dereference in phar_get_fp_offset() 2015-09-28 15:56:51 -07:00
Stanislav Malyshev 899753f240 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #70480 (php_url_parse_ex() buffer overflow read)
2015-09-28 13:08:44 -07:00
Misha Nasledov 84452dba8e Update NEWS file with LDAP fixes 2015-09-28 12:59:16 -07:00
Stanislav Malyshev 629e4da7cc Fix bug #70480 (php_url_parse_ex() buffer overflow read) 2015-09-28 11:31:14 -07:00
Andrey Hristov be6546fac9 Add support for parameters to tick functions, on C level. This is only
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
2015-09-28 11:21:17 +02:00
Bob Weinand fef88b34e7 Add NEWS entry for #70533 (credits to Anatol) 2015-09-28 01:07:38 +02:00
Anatol Belski c82e21619e fix phpdbg's -h switch
The help functionality needs a correct stdout fd, so pre setup it
for the only case.
2015-09-27 15:46:07 +02:00
Andrey Hristov 7e3cd7cadf Merge branch 'PHP-5.6' into PHP-7.0 2015-09-25 14:29:06 +02:00
Andrey Hristov 59de2c037c Fixed bug #70572 segfault in mysqlnd_connect 2015-09-25 14:06:28 +02:00
Andrey Hristov 85be6fe96b Spread the news about 70384 2015-09-25 13:54:10 +02:00
Dmitry Stogov 7e797f1302 Allow an experimental VM with tail call dispatch technique (disabled by default).
This VM may work only if all tail calls are optimized, otherwaise it will crach because of stack overflow.
Unfortunately, we can't guarantee tail call optimization in C.
2015-09-25 12:54:51 +03:00
Anatol Belski 37c85ebb94 check for test requirement 2015-09-25 11:50:15 +02:00
Anatol Belski c75346624a fix data type and warning 2015-09-25 11:50:13 +02:00
Dmitry Stogov a05fc48055 Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[]) 2015-09-25 11:50:38 +03:00
Dmitry Stogov f509706318 Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring) 2015-09-25 10:59:27 +03:00
Anatol Belski b98d09a6a9 add note about minimum openssl version 2015-09-25 09:11:33 +02:00
Anatol Belski 67aff16d94 fix ident 2015-09-25 08:30:44 +02:00
Dmitry Stogov c21d18ef95 Cleanup: avoid useless array duplication 2015-09-25 02:20:05 +03:00
Dmitry Stogov 01d5beddf4 Cleanup 2015-09-25 01:36:10 +03:00
Dmitry Stogov ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Bob Weinand abf6a0b376 Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE 2015-09-24 21:06:07 +02:00
Bob Weinand 808f62bb4d Ensure proper exception handling and EX(opline) state in USER_OPCODE handler 2015-09-24 20:33:57 +02:00
Anatol Belski 0fd7acd11d don't keep locked mutex after errors 2015-09-24 16:34:44 +02:00
Anatol Belski df832c966c avoid dangling pointers 2015-09-24 16:33:58 +02:00
Anatol Belski 3ef3d80f25 move accel_shared_globals assignment into locked block
this might fix crashes under high concurrency
2015-09-24 16:33:57 +02:00
Anatol Belski a7552ca310 add ovfl check, fix warnings 2015-09-24 16:33:56 +02:00
Anatol Belski 807c29ed14 fix warning 2015-09-24 16:33:54 +02:00
Anatol Belski 29bf529d88 fix warning 2015-09-24 16:33:53 +02:00
Dmitry Stogov 415000ed93 Fixed bug #70573 (Cloning SplPriorityQueue leads to memory leaks) 2015-09-24 16:42:59 +03:00
Adam Harvey 6413ecb439 Fix a memory leak in sqlite3_do_callback.
This was very, very obvious when using a debug build of PHP to build the
manual!

Fixes bug #70571 (Memory leak in sqlite3_do_callback).
2015-09-24 14:16:45 +02:00
Dmitry Stogov 2d55e8c186 Fix (revert) loop exit condition 2015-09-24 11:19:26 +03:00
Dmitry Stogov 262160e0e9 Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken) 2015-09-24 10:48:34 +03:00
Dmitry Stogov 92708e3e04 Cleanup: avoid reallocations 2015-09-24 02:23:09 +03:00
Dmitry Stogov 57575c0898 Cleanup: avoid reallocations 2015-09-24 01:35:16 +03:00
Dmitry Stogov 5cccd6c5b6 Fixed memory leak and avoid reallocations 2015-09-24 01:19:15 +03:00
Dmitry Stogov 51cd49b2cf Cleanup: replace removed condition with ZEND_ASSERT() 2015-09-24 00:25:51 +03:00
Dmitry Stogov 62c96059a2 Fixed memory leak. 2015-09-23 23:16:30 +03:00
Anatol Belski 75984aef44 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2015-09-23 20:01:18 +02:00
Anatol Belski f451b023d1 update NEWS 2015-09-23 20:00:38 +02:00
Anatol Belski a829108d5f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add test
  expose openssl config path so it can be tested
  Fix for Bug #70384 	mysqli_real_query(): Unknown type 245 sent by the server
2015-09-23 19:57:42 +02:00
Anatol Belski 257693614e add test 2015-09-23 19:48:38 +02:00
Anatol Belski ca89d9a797 expose openssl config path so it can be tested 2015-09-23 19:48:20 +02:00
Andrey Hristov 3aa882ad7a Spread the news about 70384 2015-09-23 18:38:29 +02:00
Andrey Hristov 003b764a49 Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server 2015-09-23 18:38:29 +02:00
Bob Weinand bccac3774b Fixed bug #70531 (-rr should not fallback to interactive mode in phpdbg) 2015-09-23 18:30:13 +02:00
Andrey Hristov f79cd18789 Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server 2015-09-23 18:25:12 +02:00
Bob Weinand 4a174ca7e6 Fixed bug #70532 (respect set_exception_handler in phpdbg) 2015-09-23 17:53:29 +02:00
Anatol Belski aba42e3dda use bundled openssl.cnf 2015-09-23 17:14:59 +02:00
Xinchen Hui c256649d63 Fixed memleaks in apache2handler 2015-09-23 07:08:51 -07:00
Xinchen Hui 3cfff60dfe Fixed NEWS 2015-09-23 07:05:47 -07:00
Xinchen Hui c87ef023aa Fixed Bug #70558 ("Couldn't fetch" error in DOMDocument::registerNodeClass()) 2015-09-23 07:01:50 -07:00
Joe Watkins 1a5d6acff6 ZEND_COMPILE_GUARDS compiler option 2015-09-23 15:33:57 +02:00
Anatol Belski 77b73c8071 update NEWS 2015-09-23 15:21:27 +02:00
Dmitry Stogov 01ed736827 Don't keep dangling pointers 2015-09-23 16:16:04 +03:00
Anatol Belski 77b9acd326 add test 2015-09-23 14:17:04 +02:00
Anatol Belski 15d43095d7 expose openssl config path so it can be tested 2015-09-23 14:17:03 +02:00
Anatol Belski 2a1c06600b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  add missing header
  silence mkdir to fix fails after unclean test run
2015-09-23 14:03:16 +02:00
Anatol Belski 8317e0fa46 add missing header
For PRIu32 and maybe more, that fixes build
2015-09-23 14:01:59 +02:00
Anatol Belski c505d55158 silence mkdir to fix fails after unclean test run 2015-09-23 13:55:28 +02:00
Dmitry Stogov a6509a6fdd Fixed test 2015-09-23 13:18:30 +03:00
Xinchen Hui 1e3333e4bd Fixed Bug #70557 (Memleak on return type verifying failed) 2015-09-23 14:10:23 +08:00
Xinchen Hui 504cd492e1 Fixed bug #70548 (Redundant information printed in case of uncaught engine exception) 2015-09-23 13:04:33 +08:00
Xinchen Hui a9636ff5a2 Fixed bug #70555 (fun_get_arg() on unsetted vars return UNKNOW)
and also keep the indices of func_get_args(). since they are similar
issue of #70574, thus reuse its test script.
2015-09-23 10:00:20 +08:00
Dmitry Stogov d82ea930ed Cleanup: removed deprecated commented code. Incorrect zval_dtor() usage replaced by zval_dtor_ptr(). 2015-09-23 01:32:30 +03:00
Dmitry Stogov 95ac055fd3 Cleanup: zend_object_std_dtor() is called through free_obj handler 2015-09-23 00:12:31 +03:00
Dmitry Stogov f9ec5be888 Properly cleanup on wrong ZEND_OVERLOADED_FUNCTION call 2015-09-22 23:51:30 +03:00
Dmitry Stogov e2e99f16e1 Cleanup: removed deprecated commented code 2015-09-22 22:55:00 +03:00
Anatol Belski afe04911a7 unmap correct handle 2015-09-22 21:20:50 +02:00
Anatol Belski a490485893 add test 2015-09-22 20:45:52 +02:00
Anatol Belski faa50318a3 nullify the memory chunk to avoid crashes when freeing resource 2015-09-22 20:33:46 +02:00
Anatol Belski 0e843a4582 check for NULL return 2015-09-22 20:05:12 +02:00
Dmitry Stogov e45f67245a Cleanup: don't keep useless dangling pointer 2015-09-22 17:48:25 +03:00
Dmitry Stogov e050412cdd Cleanup: removed old commented code 2015-09-22 17:06:10 +03:00
Dmitry Stogov c72559ddf6 Cleanup: removed deprecated commented code 2015-09-22 17:02:25 +03:00
Dmitry Stogov c49d3189b1 Cleanup: removed comments (zend_object.handle and zend_resource.handle are not going to be removed in PHP-7.0) 2015-09-22 15:56:52 +03:00
Dmitry Stogov 04bcce3c15 Cleanup (we keep and reuse size from zend_mm_huge_list) 2015-09-22 15:51:02 +03:00
Dmitry Stogov c61604b9a9 Fixed reporting about repeatable "huge" memory leaks. 2015-09-22 15:46:41 +03:00
Dmitry Stogov a9bbe5c384 Make use of timelib 2015.02's support for external memory managers. 2015-09-22 09:17:50 +01:00
Derick Rethans 922f325c68 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-22 09:08:47 +01:00
Derick Rethans 96d1d13d87 Update timelib to 2015.02 2015-09-22 08:59:45 +01:00
Derick Rethans 1d4f99e2b1 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 2015-09-22 08:47:15 +01:00
Derick Rethans dfc38fd0e4 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-22 08:45:33 +01:00
Derick Rethans e4f3fb976b Fixed test cases due to changes in rules 2015-09-22 08:42:12 +01:00
Derick Rethans fab5cbab1a Bumb timelib version to 2015.01 2015-09-22 08:41:56 +01:00
Xinchen Hui 1d6228b46a Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer reqeusts) 2015-09-22 15:28:53 +08:00
Xinchen Hui 0f3ab1c2d0 Fixed #70547 similar bug in func_get_args 2015-09-22 13:58:42 +08:00
Xinchen Hui b8ea991821 Fixed bug #70546 (ext/sysvshm: two broken tests on Solaris) by rainer.jung 2015-09-22 12:06:09 +08:00
Xinchen Hui e1dcfd2cf9 Fixed bug #70547 (unsetting function variables corrupts backtrace) 2015-09-22 11:59:35 +08:00
Xinchen Hui ed5a5bdff8 Fixed bug #70544 (ext/zip/tests/oo_addglob.phpt broken on Solaris) 2015-09-21 22:04:27 +08:00
Xinchen Hui 85eece9c4f Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 11:18:37 +08:00
Xinchen Hui a247c3a27d Fixed bug #70538 ("php-fpm -i" crashes) 2015-09-21 10:55:38 +08:00
Xinchen Hui 4febfc25a6 Use die 2015-09-20 09:34:28 -07:00
Xinchen Hui 3fc5f5cdb5 Fixed bug #70535 (XSLT: free(): invalid pointer) 2015-09-20 09:30:50 -07:00
Jakub Zelenka 6a81363405 Require at least OpenSSL version 0.9.8 2015-09-20 13:01:15 +01:00
Jakub Zelenka 76783a26d2 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-20 12:38:58 +01:00
Jakub Zelenka dcd569aad6 Use tabs for arg info indent in openssl.c 2015-09-20 12:34:35 +01:00
Xinchen Hui b0e5f9eb6c Unused var 2015-09-19 19:51:53 -07:00
Xinchen Hui bb07905a4a Fixed bug #70528 (assert() with instanceof adds apostrophes around class name) 2015-09-19 19:49:36 -07:00
Bob Weinand 509712c7d9 Add FAST_ZPP to various important stream funcs 2015-09-20 04:27:51 +02:00
Bob Weinand c9988a1e69 Remove superfluous branches 2015-09-20 02:59:30 +02:00
Bob Weinand 95dbe1d03e Short-circuit zend_parse_parameters_none() so that expensive zpp() call never happens in non-exceptional case 2015-09-20 02:43:22 +02:00
Bob Weinand 14af0f6dcb Set expectations in generator handling 2015-09-20 02:19:31 +02:00
Bob Weinand e878dff5d8 Revert accidentally committed closures.c and execute.c 2015-09-19 23:22:07 +02:00
Bob Weinand 08e253cdbc Optimize zend_mm_small_size_to_bin()
It removes a cmov operation and has a much faster branch for small allocations (especially when handling strings) (<= 64 bytes)
2015-09-19 23:07:43 +02:00
Bob Weinand b8f56013b5 Force compiler to prefer ZEND_CALL_NESTED_FUNCTION
It is by far the most used branch; compilers tended here to split the branches via an &2, &1 check, now it only does an &3 check and prefers ZEND_CALL_NESTED_FUNCTION branch
2015-09-19 19:49:44 +02:00
Bob Weinand 8f85dc141a Always properly show exit status in phpdbg
Especially when it is only set after main run (e.g. register_shutdown_function)
2015-09-19 18:30:07 +02:00
Bob Weinand 16cde23eb2 Fix oplog... 2015-09-19 17:10:16 +02:00
Xinchen Hui ff414555db Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-19 06:20:00 -07:00
Bob Weinand 491c62e2aa Apply same fixes for until 2015-09-19 15:19:26 +02:00
Xinchen Hui de6ee4c24f Fixed bug #70526 (xmlrpc_set_type returns false on success) 2015-09-19 06:10:48 -07:00
Bob Weinand 8eadde40cd Fix leave and finish 2015-09-19 14:57:36 +02:00
Yasuo Ohgaki 2f7cc862d7 Fixed bug #70529 Session read causes "String is not zero-terminated" error 2015-09-19 11:26:14 +09:00
Xinchen Hui 7680194a93 Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build) 2015-09-18 17:27:39 +08:00
Xinchen Hui d42d0460f8 RETURN_FALSE 2015-09-18 16:33:33 +08:00
Dmitry Stogov 6a3580fd56 Use Zend MM to keep statistic of non-persistent connections (calloc/free->pecalloc/pefree) 2015-09-18 10:36:09 +03:00
Matteo Beccati cc875d1a25 Skip session_regenerate_id_cookie.phpt when there's no cgi 2015-09-18 07:51:46 +02:00
Bob Weinand 5b8981f12e Add eventual escaping for phpdbg arguments 2015-09-18 00:50:08 +02:00
Bob Weinand adcabcc125 Add # delimiter to phpdbg commands 2015-09-17 22:53:10 +02:00
Dmitry Stogov 8fe171a3e0 Don't allocate memory for empty HashTables. 2015-09-17 19:17:10 +03:00
Dmitry Stogov 24fc74d412 Update information about new opcache features 2015-09-17 12:58:08 +03:00
Dmitry Stogov 41a184be10 Added information about new opcache configuration directives 2015-09-17 12:51:43 +03:00
Ferenc Kovacs dcd3bb327f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  prepare for PHP-5.6.14RC1
2015-09-17 01:49:39 +02:00
Ferenc Kovacs 11cddaf6f4 prepare for PHP-5.6.14RC1 2015-09-17 01:48:02 +02:00
Yasuo Ohgaki e341eb94cb Add test for #70516 session_regenerate_id() does not send session ID cookie 2015-09-17 05:36:47 +09:00
Anatol Belski 0c7872f88a add range check 2015-09-16 15:39:21 +02:00
Remi Collet 5ce2cc5d36 fix regressio introduce in 22e23e7cb8 2015-09-16 14:37:41 +02:00
Remi Collet 286b157a5f fix regressio introduce in 22e23e7cb8 2015-09-16 14:32:05 +02:00
Sebastian Bergmann 486848168c Fugbix typo 2015-09-15 08:58:50 -07:00
Xinchen Hui 066c05e51f Suppressed warning about this function is not used 2015-09-15 08:54:14 -07:00
Xinchen Hui a261938d50 Add Note about huge_code_pages 2015-09-15 08:28:32 -07:00
Xinchen Hui 517c59bfcb Suppressed warning -Wvolatile-register-var 2015-09-15 08:23:21 -07:00
Xinchen Hui e841016df7 Upgrade unicode_data.h to UnicodeData.txt 8.0.0 (part of bug #70475 ext/mbstring/unicode_data.h needs update) 2015-09-15 07:56:10 -07: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 fff3c1d368 prepare NEWS for RC4 2015-09-15 12:42:39 +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
Anatol Belski ad8a73dd55 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.
2015-07-10 12:06:56 +02:00
Anatol Belski ceefc0947a Revert "Tuned off dubugging of live ranges"
This reverts commit 404dc93d35.
2015-07-10 12:06:33 +02:00
Anatol Belski 2928e412e6 Revert "Remove loop_var_stack"
This reverts commit b3a4c05071.
2015-07-10 12:06:06 +02:00
Anatol Belski 770571bce9 Revert "ZEND_SEPARATE reuses temporaries"
This reverts commit dfe6fdaa72.
2015-07-10 12:05:43 +02:00
Anatol Belski 6cdf477254 Revert "Add assertion in liveliness computation"
This reverts commit 62062dcd0e.
2015-07-10 12:05:35 +02:00
Anatol Belski 5784b8f8e6 Revert "Fixed invalid live-range detection"
This reverts commit 724e98498a.
2015-07-10 12:05:26 +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
Anatol Belski ee573eba67 fixed NEWS 2015-07-09 17:34:49 +02:00
Dmitry Stogov 724e98498a Fixed invalid live-range detection 2015-07-09 17:26:01 +02:00
Nikita Popov 62062dcd0e 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-09 17:25:42 +02:00
Nikita Popov dfe6fdaa72 ZEND_SEPARATE reuses temporaries 2015-07-09 17:25:26 +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
Anatol Belski 8d09c84bd3 update NEWS 2015-07-08 01:35:42 +02:00
Anatol Belski 955303ddc8 bump the versions 2015-07-08 01:20:10 +02:00
Anatol Belski 2a0e037c0d Merge branch 'master' into PHP-7.0.0
* master: (282 commits)
  Remove loop_var_stack
  SQLite3::open/__construct has 2 optional args
  Better fix for bug #69958
  Better fix for bug #69958
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Use NULL where possible for exception class
  Allow NULL for exception_ce
  fix C89 compat
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  fix C89 compat
  added info about the user space stream context for pipes
  mention pcre.jit in the supplied php.ini-*
  Fix test related to c22da81
  add missing second argument for ucfirst to the proto
  ...
2015-07-08 01:17:19 +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
Nikita Popov b3a4c05071 Remove loop_var_stack
Instead add a loop_var member to brk_cont_element. Now that
brk_cont is compile-time the distinction is no longer necessary.

Also drops brk_cont.start, check the loop_var op_type instead.
2015-07-07 20:55:12 +02:00
Rasmus Lerdorf 40ca0f1927 SQLite3::open/__construct has 2 optional args 2015-07-07 11:53:07 -07:00
Stanislav Malyshev a5e7075d79 Merge branch 'PHP-5.6'
* PHP-5.6:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
2015-07-07 10:19:20 -07:00
Stanislav Malyshev 2d0771d66c Better fix for bug #69958 2015-07-07 10:18:22 -07:00
Stanislav Malyshev 3bee16a70a Better fix for bug #69958 2015-07-07 10:17:54 -07:00
Stanislav Malyshev d8aa5675ad Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-07 10:16:54 -07:00
Stanislav Malyshev 12ff95574b Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-07 10:15:41 -07:00
Stanislav Malyshev 00f177a5ed Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-07 10:15:41 -07:00
Stanislav Malyshev 6c884e8e84 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file
  Better fix for bug #69958
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/phar/phar_object.c
2015-07-07 10:12:51 -07:00
Aaron Piotrowski 5df893ce3c Use NULL where possible for exception class
Matches usage of zend_throw_exception()/zend_throw_exception_ex().
2015-07-07 12:10:55 -05:00
Aaron Piotrowski 29c3cd4448 Allow NULL for exception_ce 2015-07-07 12:10:55 -05:00
Stanislav Malyshev b4b082e63e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Better fix for bug #69958
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
2015-07-07 10:09:34 -07:00
Stanislav Malyshev 545eddba93 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  add missing second argument for ucfirst to the proto
2015-07-07 10:08:37 -07:00
Anatol Belski 54bcc6280c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix C89 compat
2015-07-07 18:40:16 +02:00
Anatol Belski c0142de470 fix C89 compat 2015-07-07 18:39:33 +02:00
Stanislav Malyshev 885edfef0a Better fix for bug #69958 2015-07-07 09:38:31 -07:00
Stanislav Malyshev c8157619ef update news 2015-07-07 09:38:31 -07:00
Stanislav Malyshev 97aa752fee Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-07 09:38:31 -07:00
Stanislav Malyshev 6dedeb40db Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-07 09:38:31 -07:00
Stanislav Malyshev bf58162ddf Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-07 09:38:30 -07:00
Kalle Sommer Nielsen fe842a8510 fix C89 compat 2015-07-07 18:26:14 +02:00
Anatol Belski aaee58ecc4 added info about the user space stream context for pipes 2015-07-07 17:11:24 +02:00
Anatol Belski 4bf70f4d98 mention pcre.jit in the supplied php.ini-* 2015-07-07 16:15:56 +02:00
Julien Pauli bcd6bc46f4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix test related to c22da81

Conflicts:
	ext/standard/tests/general_functions/bug41037.phpt
2015-07-07 16:03:37 +02:00
Julien Pauli 4c34d57414 Fix test related to c22da81 2015-07-07 16:01:44 +02:00
Edgar R. Sandi 18dfbf9008 Added php tests to improve extension coverage 2015-07-07 10:50:23 -03:00
Ferenc Kovacs df499b9108 Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing second argument for ucfirst to the proto
2015-07-07 15:50:02 +02:00
Ferenc Kovacs bdb9c0da86 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add missing second argument for ucfirst to the proto
2015-07-07 15:49:44 +02:00
Ferenc Kovacs b6f5cb11a4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add missing second argument for ucfirst to the proto
2015-07-07 15:49:16 +02:00
Ferenc Kovacs 29533ae528 add missing second argument for ucfirst to the proto 2015-07-07 15:48:55 +02:00
Xinchen Hui 015d20ab83 Merge branch 'master' of git.php.net:php-src 2015-07-07 21:40:46 +08:00
Xinchen Hui 9ae892ec93 Update NEWs 2015-07-07 21:38:37 +08:00
Xinchen Hui ca1ba39102 Merge branch 'PHP-5.6'
Conflicts:
	ext/sqlite3/sqlite3.c
2015-07-07 21:38:24 +08:00
Xinchen Hui 26471eb69c Fixed bug #69972 (Use-after-free vulnerability in sqlite3SafetyCheckSickOrOk()) 2015-07-07 21:37:35 +08:00
Anatol Belski a94b3b8e64 updated NEWS 2015-07-07 15:34:37 +02:00
Xinchen Hui 5bd315657c Update NEWs 2015-07-07 21:29:20 +08:00
Xinchen Hui fff374feba Merge branch 'PHP-5.6'
Conflicts:
	ext/spl/spl_iterators.c
2015-07-07 21:28:51 +08:00
Xinchen Hui e41f600365 Fixed bug #69970 (Use-after-free vulnerability in spl_recursive_it_move_forward_ex()) 2015-07-07 21:25:28 +08:00
Julien Pauli dfb0c6363f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed double ZEND_TICKS opcode generation for declare()

Conflicts:
	Zend/zend_compile.c
2015-07-07 15:03:58 +02:00
Julien Pauli c22da81b71 Fixed double ZEND_TICKS opcode generation for declare() 2015-07-07 14:56:05 +02:00
Dmitry Stogov 404dc93d35 Tuned off dubugging of live ranges 2015-07-07 15:43:14 +03:00
Dmitry Stogov 5ee8413259 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)
Squashed commit of the following:

commit 38e22106d4bdcc829dd2b64be1d3c6cdc089f3ed
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 15:12:19 2015 +0300

    Added NEWS entry

commit 0a355935bfb10b5a4c893f4db9496ea8abbcf71b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 15:06:32 2015 +0300

    Inline function, to eliminate repeatable checks

commit d937584f3aef0baae6001377b61fd700b6f36e14
Merge: 0341626 32677f5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 14:35:49 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Fixed bug #70006 (cli - function with default arg = STDOUT crash output).
      Fix x86 build
      Fixed use after free on closure_call_leak_with_exception.phpt
      Fixed test

commit 0341626ea94a5e474c660732d33884460847d5e7
Merge: 74869fa dec35de
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 12:00:53 2015 +0300

    Merge branch 'temporary_cleaning' of https://github.com/laruence/php-src into temporary_cleaning

    * 'temporary_cleaning' of https://github.com/laruence/php-src:
      Fixed checkpoint get
      Fixed crash of invalid pointer derefer
      cleanup

commit 74869fa67375b8daf772ac30b6b936fd2a2132c6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 11:45:34 2015 +0300

    Fixed wrong GOTO resolution

commit dec35ded3294e3022e88a623188c3d1d71381675
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 15:58:49 2015 +0800

    Fixed checkpoint get

commit b0f419540ad24c44810c9b05da046965618ffc65
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:47:11 2015 +0300

    Fixed crash of invalid pointer derefer (laruence)

commit 7a428d98ca2899c5933914caa0cd17b4126e952c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:35:47 2015 +0300

    Fixed identation

commit 9c3a4dce9ce02034d19d28182aa9c1298d528daf
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 10:33:52 2015 +0300

    Fixed invalid size

commit 653abc670b2a1f453b0fc3fc4a9eca919ee870cc
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 11:29:14 2015 +0800

    Fixed crash of invalid pointer derefer

commit e04500ceda606ac4f364d03bcd562327bdc74eee
Author: Xinchen Hui <laruence@gmail.com>
Date:   Tue Jul 7 11:28:26 2015 +0800

    cleanup

commit 34183e1687681038e77b650078927b35ee84e933
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:49:46 2015 +0300

    op_array->T_liveliness compression

commit 2f6ad845795a08c3d7ac219e9c42950565b20394
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:44:44 2015 +0300

    White spaces

commit be83f115a3f82a548c8d377c66574de5e5187410
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:42:26 2015 +0300

    Identation

commit 1f5084b99038c374ac012b017c4d1652bb5d4222
Merge: 91b620d 1adf3df
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:41:54 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Throw TypeError for invalid callback
      Fix crash when exception occurs during nested rope
      Fix crash when exception is thrown during ROPE_END
      Small cleanup in ternary compilation
      move the define to the right place
      fix ext/ldap build
      Rectify information about invalid shift warning being now ArithmeticError

commit 91b620d684c5a2296774432d5d0ff8f5d14397d6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 04:32:04 2015 +0300

    Replace GOTO by FREE/FE_FREE and JMP at compile time

commit 7052e5697918fab83d2975977c3392f7188fbc87
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Jul 7 02:25:08 2015 +0300

    Use zend_regenerate_var_liveliness_info() to regenerate information after pass two.

commit ae72b0dc6797815a846b8f95abccb36367422d27
Merge: a81c4bb a919fe8
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 21:02:34 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Do not display EXT_TYPE_UNUSED in phpdbg opcodes
      Run debug build with opcache on travis

commit a81c4bb8c6f1ba8124a5a7636694480ff0f1328c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 20:59:34 2015 +0300

    Improved algorithm. It's actually the same algorithm with second loop removed and simpler temporary data structures. The only difference may be in "re-defined" vatriable handling. Now live-range in that case started from the seconnd definition (this must be more safe).

commit 9a16810f7a7c10373603c5250d985616acf45e97
Merge: bbfbe47 001ecd3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 17:57:45 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Simplify TMP var number decoding (without HashTable)

commit bbfbe470c865cb8b3cae8bf6518e6d06af525522
Merge: 0bda4ab 436b01e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 17:02:01 2015 +0300

    Merge branch 'master' into temporary_cleaning

    * master:
      Avoid dangerous optimization
      Fixed JMPZNZ instruction printing
      Attempt at falling back on ldap_find_control for Mac OS

commit 0bda4abea7ba0a51c2ec125edb547645d0329792
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 16:05:33 2015 +0300

    Fixed live-range construction for OP_DATA opcode
    Added comments about algorithm assumtions

commit 521ad9df98fdf1dd8b7c212799ddeb1a84483e6f
Merge: 4398dab a09dcb0
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 14:54:15 2015 +0200

    Merge branch 'master' of https://github.com/php/php-src into temporary_cleaning

commit 4398dab82f9a5ce64df55b24988ce7d31e24074f
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 13:51:27 2015 +0200

    Add a few phpt tests related to temporary cleaning

commit 739656f83ff5b570bb311d2c7cb2d72380a3c759
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 14:28:49 2015 +0300

    Fixed Zend/tests/foreach_004.phpt failure (FE_FETCH shouldn't be included into TMP vatriablr live range)

commit 3df462a2bcf5fa8f9244ea299178152a5d436277
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 13:41:02 2015 +0300

    Improve data layout (reduce the op_array structure size on 64-bit systems)

commit 883b73c56e6dab6489ae4cda2c1331b53a995586
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Jul 6 13:28:45 2015 +0300

    Removed op_array->brk_cont_array

commit ae5e58b59843513505e84e396c1446ac35cb1b94
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 04:22:58 2015 +0200

    Fix bug with brk_cont variable free / free loop vars via temporary liveliness info

commit b4223ca62771e1003c9ab778a09a177ad71e6d57
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Mon Jul 6 04:07:07 2015 +0200

    Fix bugs / cleanup fixes

commit ea33189d220c7fc0884848571635abe3cddd2f4d
Author: Xinchen Hui <laruence@gmail.com>
Date:   Sun Jul 5 20:58:38 2015 +0800

    Removed useless TsTop

commit 1dbb007e4addba9ac3bfc227db27a651cbcf5ede
Merge: 550bbf8 3a8af24
Author: Xinchen Hui <laruence@gmail.com>
Date:   Sat Jul 4 15:06:44 2015 +0800

    Merge branch 'temporary_cleaning' of https://github.com/dstogov/php-src into temporary_cleaning

commit 3a8af245290ceb507108340831254672f24022fa
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 16:15:36 2015 +0300

    More exceptions from regular liveliness analyses (with explanation in comments).
    Mark old "unexplained" exceptions with ???.

commit ba721efa2cbd2136668fec956ef3b034ac1a29d6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 14:16:09 2015 +0300

    Print list of live temp variables (at least for internal debugging)

commit 8d1f88fe91e62b4333703c58b871d85b66fb7b70
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 13:31:56 2015 +0300

    Use op_array->T_liveliness to free incomplete ropes and restore error_reporting level on exception

commit 80c1d0d779e6e9609a211907838f3727aa7b301a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jul 3 11:05:39 2015 +0300

    Don't keep empty T_liveliness

commit 501ae8aaac0a92368b50e9f342b04d7334d263f6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jul 2 22:31:48 2015 +0300

    Reverted changes to Zend/zend_arena.h.
    Reuse CG(arena) instead of creating a new one.

commit a4fce36907147df5ac1af78b44135e3f07c1844c
Merge: 6ff7246 fd0fcce
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jul 2 22:01:42 2015 +0300

    Merge branch 'temporary_cleaning' of github.com:bwoebi/php-src into temporary_cleaning

    * 'temporary_cleaning' of github.com:bwoebi/php-src:
      Fix remaining issues with compacted temporaries
      Fix regression from last commit (+1 ?!)
      Fix off-by-one (opcache may remove last ZEND_RETURN)
      Speed algorithm up, more fail safety when reusing temporaries
      Dumb bug in opcode.c (forgot to update Ts[i])
      Fix opcache support
      Exempt ROPE temporaries from freeing
      Hmm, we need temporary info for all the opcodes
      Add opcache support for cleaning in optimization step (Opcache seems to have a few unrelated issues which blow up together with that patch)
      Add proper temporary cleaning upon frame abortion
      Fix arena on small sizes (size < sizeof(zend_arena))

commit fd0fcce81177717f3a05ac87192b5ed05eead0a1
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Thu Jul 2 20:00:33 2015 +0200

    Fix remaining issues with compacted temporaries

commit 427dc58bbb93022d1c2077f874afcdb9dd82d5c5
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 22:49:12 2015 +0200

    Fix regression from last commit (+1 ?!)

commit 1adcf56a6e9f09e7ad06331d4d6280035b17a7d1
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 22:17:07 2015 +0200

    Fix off-by-one (opcache may remove last ZEND_RETURN)

commit 25b231b7841fa4078c65976cabdd843845a6cbe6
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 20:59:24 2015 +0200

    Speed algorithm up, more fail safety when reusing temporaries

commit 22d9d05350e35d180018d0bccbad6f173cb4797d
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 16:48:46 2015 +0200

    Dumb bug in opcode.c (forgot to update Ts[i])

commit 6538269bfa5bcbad34fc2f051b0fd5e4ebf2ff00
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Wed Jul 1 13:05:52 2015 +0200

    Fix opcache support

commit 333a7c4a8813a45dc79ce55b8e9c0a0b98671e13
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Sat Jun 27 22:40:21 2015 +0200

    Exempt ROPE temporaries from freeing

commit 02585f77085427baea48448c134a96c542af3337
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 16:20:55 2015 +0200

    Hmm, we need temporary info for all the opcodes

commit cbcaedbd78199897e5cacffd700b706f21590abf
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 01:04:09 2015 +0200

    Add opcache support for cleaning in optimization step
    (Opcache seems to have a few unrelated issues which blow up together with that patch)

commit fef649f4067823a1f96f85340cf715e5877310bc
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Fri Jun 26 01:02:27 2015 +0200

    Add proper temporary cleaning upon frame abortion

commit 1cec2e7271b789b84601f8acf385950af1bb0c7c
Author: Bob Weinand <bobwei9@hotmail.com>
Date:   Thu Jun 25 23:33:21 2015 +0200

    Fix arena on small sizes (size < sizeof(zend_arena))
2015-07-07 15:41:12 +03:00
Xinchen Hui 32677f568b Merge branch 'master' of git.php.net:php-src 2015-07-07 19:21:54 +08:00
Xinchen Hui 7af4e6d02d Fixed bug #70006 (cli - function with default arg = STDOUT crash output). 2015-07-07 19:21:02 +08:00
Kalle Sommer Nielsen 2bd4b18c24 Merge branch 'master' of https://git.php.net/push/php-src 2015-07-07 12:43:58 +02:00
Kalle Sommer Nielsen 0ac2371b5a Fix x86 build 2015-07-07 12:41:05 +02:00
Xinchen Hui 333528089e Fixed use after free on closure_call_leak_with_exception.phpt 2015-07-07 18:19:57 +08:00
Dmitry Stogov 636c16b186 Fixed test 2015-07-07 10:14:37 +03:00
Stanislav Malyshev ed84af4b88 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Better fix for bug #69958
2015-07-07 00:01:42 -07:00
Stanislav Malyshev eda31f57fb Better fix for bug #69958 2015-07-07 00:01:26 -07:00
Stanislav Malyshev 09de64a58d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Better fix for bug #69958
2015-07-06 23:03:05 -07:00
Stanislav Malyshev 61b0b80388 Better fix for bug #69958 2015-07-06 22:58:28 -07:00
Stanislav Malyshev 485b7c6981 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update news
2015-07-06 21:53:02 -07:00
Stanislav Malyshev c938d2f537 update news 2015-07-06 21:52:56 -07:00
Stanislav Malyshev 303d97feda Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
2015-07-06 21:52:49 -07:00
Stanislav Malyshev 0d2f147d80 Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-06 21:50:01 -07:00
Aaron Piotrowski 1adf3df81e Throw TypeError for invalid callback
Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().
2015-07-06 15:03:35 -05:00
Nikita Popov 724051e3bd Fix crash when exception occurs during nested rope
Adds extra condition that the rope var of INIT/ADD must match the
one one END.
2015-07-06 20:53:54 +02:00
Nikita Popov 89ce8d28de Fix crash when exception is thrown during ROPE_END
The CHECK_EXCEPTION() was done at a point where the old opline is
still used, thus redirecting the write to the result var into
EX(call) instead.

Handling the exception in-place to avoid leaking result.
2015-07-06 20:15:45 +02:00
Nikita Popov f3498783df Small cleanup in ternary compilation 2015-07-06 20:15:45 +02:00
Anatol Belski 73c0fc0df4 move the define to the right place
thanks Kalle )
2015-07-06 19:43:35 +02:00
Anatol Belski cb2d33f3e2 fix ext/ldap build 2015-07-06 19:35:29 +02:00
Bob Weinand 23242fd61d Rectify information about invalid shift warning being now ArithmeticError 2015-07-06 18:09:36 +02:00
Bob Weinand a919fe8606 Do not display EXT_TYPE_UNUSED in phpdbg opcodes 2015-07-06 18:05:03 +02:00
Bob Weinand b3ab7c13dc Run debug build with opcache on travis 2015-07-06 17:41:24 +02:00
Dmitry Stogov 001ecd3198 Simplify TMP var number decoding (without HashTable) 2015-07-06 17:56:48 +03:00
Dmitry Stogov 436b01e379 Avoid dangerous optimization 2015-07-06 16:52:38 +03:00
Dmitry Stogov 1a9f4f90da Fixed JMPZNZ instruction printing 2015-07-06 16:30:50 +03:00
Côme Bernigaud da6e286dbb Merge branch 'PHP-5.6'
* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +02:00
Côme Bernigaud 022068342b Attempt at falling back on ldap_find_control for Mac OS 2015-07-06 14:54:04 +02:00
Côme Bernigaud a09dcb0e13 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:28:01 +02:00
Anatol Belski 535b2cc02b update NEWS about #69900
backport for 5.6 to go
2015-07-06 14:27:17 +02:00
Côme Bernigaud 42f7e4c044 Updated README, added test to create LDAP base if missing and ease tests 2015-07-06 14:26:49 +02:00
Dmitry Stogov 2f7b178fac Fixed test (shift operators throw Error) 2015-07-06 12:28:14 +03:00
Dmitry Stogov 7a1a499377 Fixed return value 2015-07-06 11:25:19 +03:00
Xinchen Hui 5e7fd530ce Merge branch 'signed_char' of https://github.com/antonblanchard/php-src 2015-07-06 15:36:55 +08:00
Xinchen Hui 84e07b08bd Reorder the conditions 2015-07-06 15:24:51 +08:00
Xinchen Hui ce550cefde Fixed segfault while with generating ext info 2015-07-06 15:22:40 +08:00
Anton Blanchard 275009d0bd http parser code assumes char is signed
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:

        if (c == -1) goto error;
2015-07-06 10:13:00 +10:00
Anatol Belski a97f764472 bring back the division by zero warning 2015-07-05 20:18:17 +02:00
Stanislav Malyshev b9d3540304 Merge branch 'pull-request/1368'
* pull-request/1368:
  moved function warning test to money_format_error.phpt file
2015-07-05 01:24:35 -07:00
Stanislav Malyshev 013d1296d6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:10:29 -07:00
Dominic b27bcd90b3 Cleaned white spaces in PHP_INI definition of phar
Removes unnecessary white spaces.
2015-07-05 01:10:22 -07:00
Stanislav Malyshev 9b6c3d19c5 Merge branch 'pull-request/1351'
* pull-request/1351:
  Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:04:22 -07:00
Stanislav Malyshev 64eb8338b1 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix typo, see #68476
2015-07-05 01:01:27 -07:00
Stanislav Malyshev 04ca04f830 Merge branch 'pull-request/1324' into PHP-5.6
* pull-request/1324:
  fix typo, see #68476
2015-07-05 01:01:00 -07:00
Stanislav Malyshev 3e88d610e5 Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-04 23:47:48 -07:00
Stanislav Malyshev 452d30cf7d Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-04 21:01:50 -07:00
Bob Weinand 56b6e0dd14 Fix use after free with opcache (interned strings) 2015-07-05 02:00:52 +02:00
Kalle Sommer Nielsen 12b79fcb05 This macro check is not needed (Anatol) 2015-07-04 21:21:15 +02:00
Kalle Sommer Nielsen ce2cd89258 Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c) 2015-07-04 18:55:22 +02:00
Xinchen Hui 550bbf8f46 Fixed bug #69983 (get_browser fails with user agent of null) 2015-07-04 11:05:50 +08:00
Aaron Piotrowski 1a0ddf988c Switch code on thrown Errors to 0, update related tests 2015-07-03 17:53:42 -05:00
Aaron Piotrowski fbcc823952 Remove E_EXCEPTION 2015-07-03 17:53:42 -05:00
Aaron Piotrowski 02623ddb82 Switch macro with __VA_ARGS__ to function 2015-07-03 17:53:41 -05:00
Aaron Piotrowski 22c38b2ef5 Remove need to pass error level 2015-07-03 17:53:41 -05:00
Aaron Piotrowski 5a99c07ecc Enable throwing custom exceptions from errors 2015-07-03 17:53:40 -05:00
Nikita Popov 866bd89b1d Always report object leaks
Previously cycles were excluded from leak reports, however the
situation here has improved a lot in the meantime and we can
report all leaks.
2015-07-03 19:33:34 +02:00
Nikita Popov 3c33854e7c Don't leak generator cycle in ReflectionGenerator test
This is tracked by bug #69989.
2015-07-03 19:33:28 +02:00
Aaron Piotrowski ed1b64877d Switch position of ce in exception ce variable names 2015-07-03 09:45:03 -05:00
Aaron Piotrowski a812a74c2e Change zend_exception_get_default() to zend_exception_ce 2015-07-03 09:44:48 -05:00
Aaron Piotrowski f9e9d3a437 Cleanup exception ce API
Removed recently added functions to get Error ce's and marked the old functions
fetching default_exception_ce and error_exception_ce as deprecated.
2015-07-03 09:44:30 -05:00
Anatol Belski 9adfb053e6 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix backport mistake
2015-07-03 16:22:01 +02:00
Anatol Belski b281211979 fix backport mistake
in 5.6 it has to be explicitly copied to avoid double free
2015-07-03 16:21:02 +02:00
Christoph M. Becker e75cf6b7e4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed fix #69975 wrt. ODBCVER < 0x0300
2015-07-03 13:32:05 +02:00
Christoph M. Becker 344ff5dd4c fixed fix #69975 wrt. ODBCVER < 0x0300 2015-07-03 13:30:39 +02:00
Anatol Belski 02df0cb02b improve info about the applink 2015-07-03 12:45:59 +02:00
Anatol Belski 9d9f372df6 added openssl applink shim note to UPGRADING.INTERNALS 2015-07-03 12:40:54 +02:00
Anatol Belski 274edb4c6f add missing item in the content table 2015-07-03 12:40:53 +02:00
Anatol Belski 54e19fe7c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  backport c01943bffc into 5.6
2015-07-03 11:17:16 +02:00
Anatol Belski d870683d6b backport c01943bffc into 5.6 2015-07-03 11:16:02 +02:00
Anatol Belski c01943bffc fix improper behavior
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
2015-07-03 10:15:52 +02:00
Anatol Belski 3d7343f609 integrate the applink shim in the other bins 2015-07-03 07:11:14 +02:00
Anatol Belski 59444347d1 integrate the openssl applink shim
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
2015-07-03 07:11:13 +02:00
Xinchen Hui e8f992c163 Catch the specifical exception 2015-07-03 11:18:53 +08:00
Christoph M. Becker 21029da71c Merge branch 'PHP-5.6'
* PHP-5.6:
  Added more tests to improve function coverage
2015-07-03 03:12:09 +02:00
Edgar R. Sandi 48d71af7ed Added more tests to improve function coverage 2015-07-03 03:02:40 +02:00
Aaron Piotrowski 68baa539dc Allow integer default for float type 2015-07-02 18:07:24 -05:00
Christoph M. Becker 2768bdbce0 updated NEWS 2015-07-03 00:29:44 +02:00
Christoph M. Becker caa539b481 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
2015-07-03 00:25:03 +02:00
Christoph M. Becker 616661e0f8 updated NEWS 2015-07-03 00:23:44 +02:00
Christoph M. Becker 16db4d1462 Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.

The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
2015-07-03 00:15:47 +02:00
Bob Weinand 57881e878d Update NEWS for bug #69957 2015-07-02 21:19:26 +02:00
Niklas Keller 5f72d94a8b Correct type hint name for booleans in method signatures 2015-07-02 21:14:30 +02:00
Bob Weinand 6ff72467dc XFAILED tests are not "You may have found a problem in PHP" 2015-07-02 20:49:30 +02:00
Bob Weinand 94722e12cf Introduce ArithmeticError 2015-07-02 20:47:44 +02:00
Dmitry Stogov b874f1a73d Cleanup (avoid reallocation) 2015-07-02 20:29:06 +03:00
Dmitry Stogov 07e646f8ff Cleanup (avoid reallocation) 2015-07-02 19:09:37 +03:00
Dmitry Stogov 9ea98d676b Cleanup (avoid reallocations) 2015-07-02 18:58:04 +03:00
Dmitry Stogov 0fd2b4c030 Cleanup (avoid reallocation) 2015-07-02 18:50:54 +03:00
Anatol Belski d0787534c0 add missing items to the table of contents 2015-07-02 16:34:42 +02:00
Anatol Belski 79ca2b06b6 update UPGRADING infos 2015-07-02 16:32:57 +02:00
Anatol Belski 6f3dd4d45b fix pipe peek timeout 2015-07-02 15:19:38 +02:00
Christoph M. Becker 58b982afed Fix alignment on 32-bit 2015-07-02 14:23:07 +02:00
Christoph M. Becker a88c68f833 improve timings evaluations in test 2015-07-02 14:23:06 +02:00
Anatol Belski cefca35692 use proper place to cleanup 2015-07-02 14:23:05 +02:00
Anatol Belski 4fe8d629d0 fix test for systems with lower time resolution 2015-07-02 14:23:04 +02:00
Anatol Belski 8fed210610 remove stderr descriptor 2015-07-02 14:23:03 +02:00
Anatol Belski afd8ebca78 no need to fflush here 2015-07-02 14:23:02 +02:00
Anatol Belski 5750058ddb added test for bug #69900 2015-07-02 14:23:01 +02:00
Anatol Belski aec332e6b4 select the case to set the pipe blocking option more precisely 2015-07-02 14:23:00 +02:00
Anatol Belski d6130fada6 fixed wrong number for the new option 2015-07-02 14:22:59 +02:00
Anatol Belski 4e5758f377 fix c/p issue 2015-07-02 14:22:58 +02:00
Anatol Belski d516a14fb9 properly set the pipe blocking option 2015-07-02 14:22:57 +02:00
Anatol Belski 1a5a4d546e add missing stuff is the header 2015-07-02 14:22:56 +02:00
Anatol Belski 734d907aa4 initial stuff to make allow blocking pipes on windows 2015-07-02 14:22:55 +02:00
Xinchen Hui 6de750efb7 Fixed conditional jump or move depends on uninitialised value(s)
==11551==    at 0x57CB23C: xpmParseData (parse.c:702)
2015-07-02 19:02:49 +08:00
Xinchen Hui 72b0627315 Fixed bug #69521 (Segfault in gc_collect_cycles()). 2015-07-02 18:43:06 +08:00
Xinchen Hui 3422fb57c8 Use hash_str directly 2015-07-02 12:31:26 +08:00
Xinchen Hui ba91bc36cd Same here 2015-07-02 12:23:50 +08:00
Xinchen Hui ba711aec30 Use one_char_string 2015-07-02 12:19:55 +08:00
Xinchen Hui 0e68e27854 Use one_char_string 2015-07-02 12:18:23 +08:00
Xinchen Hui 70d7ecfec6 Use zend_string in setcookie (save value reallocated) 2015-07-02 12:04:28 +08:00
Xinchen Hui 017d3530f3 Unnecessary duplication 2015-07-02 11:47:22 +08:00
Xinchen Hui fc58025627 This can not be true 2015-07-02 11:04:24 +08:00
Bob Weinand 06fcf94c45 CT eval ZEND_DIV in all cases (warning was removed) 2015-07-02 02:20:58 +02:00
Bob Weinand 007d7ac7ca Use DivisionByZeroError instead of exception for %/intdiv() 2015-07-02 02:20:58 +02:00
Bob Weinand f9724b93f6 Remove warning upon division by zero 2015-07-02 02:20:58 +02:00
Dmitry Stogov fa1abb5677 Fixed memory leak because of incorrect 'if ();' optimization 2015-07-02 02:00:34 +03:00
Christoph M. Becker e6f1638ad0 updated NEWS 2015-07-01 23:50:12 +02:00
Christoph M. Becker e49922d3f8 Fix #69976: Unable to parse "all" urls with colon char
If a colon occurs in a query string or fragment of a partial URL without
scheme, parse_url() tries to regard it as port separator. If up to 5 digits
follow and then a slash or the end of the string, parse_url() fails.

We're fixing this by checking whether the colon is part of the query string or
the fragment, under the assumption that question marks and hash signs are only
allowed as separators of query string and fragments, respectively, what is
guarenteed for URIs (RFC 3986), but not necessarily for URLs (RFC 1738) where
question marks are allowed for usernames and passwords.

Anyhow, this constitutes a minor BC, so the fix is applied to master only.
2015-07-01 23:48:16 +02:00
Dmitry Stogov 6daed13c8b Cleanup (removed dead code) 2015-07-01 22:18:40 +03:00
Dmitry Stogov b4db4114c5 Cleanup (avoid reallocation) 2015-07-01 22:17:55 +03:00
Dmitry Stogov 887e5ad110 Cleanup (avoid reallocation) 2015-07-01 22:17:08 +03:00
Dmitry Stogov d2d326a381 Cleanup (avoid reallocatios and side effects in php_strip_tags) 2015-07-01 19:04:18 +03:00
Dmitry Stogov 068f63ceb2 Fixed broken name 2015-07-01 18:23:06 +03:00
Dmitry Stogov 2ea3258ed5 Cleanup (updated comments) 2015-07-01 17:32:04 +03:00
Dmitry Stogov 819fd30cb3 Cleanup (replce hack by a clean implementation) 2015-07-01 17:30:00 +03:00
Dmitry Stogov 26e8329d0d Cleanup (removed dead code) 2015-07-01 17:07:57 +03:00
Dmitry Stogov c34651e8f8 Cleanup (avoid duplication) 2015-07-01 17:01:42 +03:00
Dmitry Stogov eeaf73439a Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  change the inclusion order which fixes the vc build
2015-07-01 16:32:13 +03:00
Dmitry Stogov a0b55e6a37 Cleanup (updated comments about optimization of comparison with IS_NULL) 2015-07-01 16:31:20 +03:00
Anatol Belski 333db013fd change the inclusion order which fixes the vc build 2015-07-01 15:21:34 +02:00
Dmitry Stogov e2baf737ae Cleanup (we don't use is_ref=1/refcount=2 trick to trigger COW in PHP-7) 2015-07-01 16:15:45 +03:00
Dmitry Stogov c47c526290 Cleanup (avoid reallocation) 2015-07-01 14:59:58 +03:00
Dmitry Stogov 89b49b02fc Cleanup (avoid reallocation) 2015-07-01 14:12:46 +03:00
Dmitry Stogov 7d82deab35 Cleanup (avoid reallocation). 2015-07-01 14:08:54 +03:00
Dmitry Stogov 34ec1c96e7 Cleanup (avoid reallocation). 2015-07-01 13:49:57 +03:00
Dmitry Stogov f7b6de5b5e Cleanup (avoid string reallocations) 2015-07-01 13:26:39 +03:00
Dmitry Stogov 53403fe56d Get rid of ZVAL_ZVAL() macro usages. Replace them with more clear and optimal equialent sequences. 2015-07-01 02:05:21 +03:00
Rasmus Lerdorf 324d5ecb7e debug_print_backtrace has a 2nd optional arg 2015-06-30 09:57:49 -07:00
Rasmus Lerdorf f2249bf95a php_uname has an optional arg 2015-06-30 09:55:00 -07:00
Xinchen Hui ab0771c60a Merge branch 'amortize-hash-compaction' of https://github.com/kaja47/php-src 2015-06-30 21:26:07 +08:00
Dmitry Stogov 7aa7627172 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 13:59:27 +03:00
Côme Bernigaud d554d64f64 Merge branch 'PHP-5.6'
* PHP-5.6:
  keep LDAP_DEPRECATED in config.w32
2015-06-30 09:31:19 +02:00
Anatol Belski 57525d01dc keep LDAP_DEPRECATED in config.w32 2015-06-30 09:30:48 +02:00
Aaron Piotrowski f7565a93d8 Add tests for dynamic static call to instance method 2015-06-30 07:07:17 +02:00
Aaron Piotrowski ffd36e0fc8 Throw Error on dynamic call to instance method when called statically 2015-06-30 07:07:17 +02:00
Bob Weinand dd2e6e866d Fix test failures from previous commit
(I really don't get that issue in phar... if there's a better fix, it's welcome...)
2015-06-30 07:02:56 +02:00
Christopher Jones 99cac5055e More PHP 7 patches (Rajendra/Abdullah) 2015-06-30 13:54:40 +10:00
Bob Weinand 6ad9cd5367 Only call stream_flush if anything was written
This avoids flushing in readonly mode upon close
2015-06-30 03:49:54 +02:00
Dmitry Stogov 4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Christopher Jones 8cce5b2641 Fix Windows compilation warnings (Senthil) 2015-06-30 08:48:37 +10:00
Christoph M. Becker 8b064a18c8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Improved code coverage of explode function
2015-06-29 23:55:18 +02:00
Edgar R. Sandi 1b1a86c415 Improved code coverage of explode function 2015-06-29 23:49:41 +02:00
Christoph M. Becker e32a60dd88 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added basic and error tests for hex2bin function
2015-06-29 23:16:50 +02:00
Edgar R. Sandi d2bc45f6b3 Added basic and error tests for hex2bin function 2015-06-29 23:10:50 +02:00
Anatol Belski 845b191f16 refix the negative zend_long to size_t casts
There is no good way to fix this for 32-bit without enormously
overcomplicating the logic. Therefore switching back to the previous
code and adding the casts to ensure there are no sudden casts of
negative to size_t.
2015-06-29 20:41:39 +02:00
Christoph M. Becker a378322409 Merge branch 'PHP-5.6'
* PHP-5.6:
  adding several other testing scenarios of code without coverage in stripcslashes function
2015-06-29 19:26:01 +02:00
Edgar R. Sandi a8d61ab7f0 adding several other testing scenarios of code without coverage in stripcslashes function 2015-06-29 19:20:23 +02:00
Christoph M. Becker df8f3a0eaa Merge branch 'PHP-5.6'
* PHP-5.6:
  adding another testing scenario without coverage in setlocale function
2015-06-29 18:25:30 +02:00
Edgar R. Sandi 7acdfdc84e adding another testing scenario without coverage in setlocale function 2015-06-29 18:15:03 +02:00
Dmitry Stogov 6cf6f2c6bf Merge branch 'PHP-5.6'
* PHP-5.6:
  On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent.
  Putting back deprecated symbols for ldap_sort
  Removed deprecated function calls from ldap module
  Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 18:14:14 +03:00
Dmitry Stogov dc588997e2 On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
This may make optimisation for entities from DSO extensions inconsistent.
2015-06-29 18:01:01 +03:00
Dmitry Stogov ee1e67fae6 On Windows PHP may be restarted with different set of DSO extensions without SHM reset.
This may make optimisation for entities from DSO extensions inconsistent.
2015-06-29 17:45:56 +03:00
jrchamp edb3ab2a2a UPGRADING typos/wording 2015-06-29 16:16:51 +02:00
Dmitry Stogov 4bd22cf1c1 Improved zend_string API (Francois Laupretre)
Squashed commit of the following:

commit d96eab8d79b75ac83d49d49ae4665f948d15a804
Author: Francois Laupretre <francois@tekwire.net>
Date:   Fri Jun 26 01:23:31 2015 +0200

    Use the new 'ZSTR' macros in the rest of the code.

    Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
2015-06-29 16:44:54 +03:00
Côme Bernigaud 667e9bd417 Deprecating ldap_sort the right way 2015-06-29 14:31:20 +02:00
Dmitry Stogov 66031cfe19 Restored old behavior 2015-06-29 14:10:46 +03:00
Anatol Belski c783645b99 fix more places with subtle negative zend_long to size_t cast 2015-06-29 12:15:21 +02:00
Anatol Belski c2ac0304a9 remove useless check
thanks Yasuo :)
2015-06-29 12:15:20 +02:00
Anatol Belski 8ccf29eb04 remove comment
f and l are the $start and $length, since they come from the user
land, they only can be zend_long
2015-06-29 12:15:19 +02:00
Dmitry Stogov 0b35e4a3be Revert "Fixed last previously broken tests"
This reverts commit 79b1832dd5.
2015-06-29 13:05:14 +03:00
Dmitry Stogov 642c379092 Prevent attempts of compile-time evaluation of invalid operators (e.g. division/modulo by zero and shift by negative number) 2015-06-29 12:58:07 +03:00
Dmitry Stogov 1bba4452e7 Reverted wrong fb08798c9f 2015-06-29 12:20:09 +03:00
Andreas Heigl 6e84f8e95e Fixes ldap_sort-tests
Thanks to Côme Bernigaud for fixing!
2015-06-29 11:11:11 +02:00
Andreas Heigl 85aabd3e85 Adds deprecation-message for ldap_sort 2015-06-29 11:11:11 +02:00
Dmitry Stogov 625dba022c Don't evaluate invalid constant expressions. 2015-06-29 11:35:12 +03:00
Anatol Belski 5060060317 fix negative zend_long to size_t cast 2015-06-29 10:27:42 +02:00
Edgar R. Sandi 8271890d8d removed unreachable code in the substr_replace function 2015-06-29 10:27:41 +02:00
Dmitry Stogov 8e923197b4 Fixed bug #69955 (Segfault when trying to combine [] and assign-op on ArrayAccess object). (Laruence) 2015-06-29 11:17:56 +03:00
Anatol Belski 07c971b665 keep LDAP_DEPRECATED in config.w32 2015-06-29 10:12:36 +02:00
Côme Bernigaud d4077410b8 Putting back deprecated symbols for ldap_sort 2015-06-29 09:42:47 +02:00
Côme Bernigaud 0483b6e868 Removed deprecated function calls from ldap module
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree

Only thing left is ldap_sort_entries, no replacement

Conflicts:
	ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Côme Bernigaud 4f7808ec50 Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
Conflicts:
	ext/ldap/ldap.c
2015-06-29 09:42:47 +02:00
Xinchen Hui bb3d545e5e Merge branch 'master' of git.php.net:php-src 2015-06-29 15:36:55 +08:00
Xinchen Hui 4cc0096e00 Fixed memroy errors with valgrind 2015-06-29 15:36:02 +08:00
Stanislav Malyshev 265b73e6ff Merge branch 'PHP-5.6'
* PHP-5.6:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

Conflicts:
	ext/standard/mail.c
2015-06-29 00:31:56 -07:00
Côme Bernigaud 2e85e6d3ee Merge PR about LDAP cleaning by removing deprecated calls
Merge branch 'pull-request/1357' into PHP-5.6

* pull-request/1357:
  Putting back deprecated symbols for ldap_sort
  Removed deprecated function calls from ldap module
  Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
2015-06-29 09:31:37 +02:00
Stanislav Malyshev d7daf814b7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-29 00:30:55 -07:00
Xinchen Hui a5d38e0dea Merge branch 'master' of git.php.net:php-src 2015-06-29 15:17:58 +08:00
Xinchen Hui 5ba28d76d2 Fixed segfault in wordpress (introduced in rev 4a4529adb0) 2015-06-29 15:13:09 +08:00
Côme Bernigaud 736d840c8b Putting back deprecated symbols for ldap_sort 2015-06-29 09:07:49 +02:00
Anatol Belski 5e3a3461c2 fix tests 2015-06-29 09:05:56 +02:00
Anatol Belski a1cf46bb1f remove useless assignment 2015-06-29 07:33:20 +02:00
Anatol Belski 8430ec1788 fix FCGI crash in TS mode
If CGI TS build is used, and there are some hard errors (fe missing
dependency .dll or .so), the core will want to log it. The CGI
log function will want to check whether fcgi_logging is enabled. But,
if this kind of error happens in the extension register phase,
MINIT for the CGI module is most likely wasn't run yet (startup phase).
That will result in accessing uninitialized globals and a crash.
2015-06-29 07:33:19 +02:00
Stanislav Malyshev 8f2e08239f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:23:00 -07:00
Stanislav Malyshev cd9c39d77c Merge branch 'pull-request/1350' into PHP-5.4
* pull-request/1350:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
2015-06-28 20:18:56 -07:00
Bob Weinand b34f9bc2e9 Fix assertion failure with Z_REFCOUNT() in info constants 2015-06-29 03:43:51 +02:00
Rasmus Lerdorf 01ceb0f7fa 2nd arg of sprintf is optional 2015-06-28 18:08:22 -07:00
Bob Weinand 088f589f7d Make backtraces *much* more readable 2015-06-29 02:51:10 +02:00
Bob Weinand f500471e8c Add yield from to frame leaving instructions 2015-06-29 02:05:33 +02:00
Bob Weinand 5e16722309 Show exception source in phpdbg 2015-06-29 01:41:04 +02:00
Bob Weinand 79b1832dd5 Fixed last previously broken tests 2015-06-29 01:00:12 +02:00
Bob Weinand e5fae77969 Show full signature upon inheritance mismatch 2015-06-29 01:00:12 +02:00
Bob Weinand 9f77c44d47 Remove now unneeded step option (-s) 2015-06-29 01:00:12 +02:00
Jakub Zelenka f30503ce4e Fix incompatible JSON errors
This fixes differences in error codes with PHP 5 and 7.
The malformed UTF-8 and control character error codes are
now returned even in non-string context which makes it
the same as it was in PHP 5 json ext.
2015-06-28 18:09:10 +01:00
Bob Weinand fb08798c9f Fix bug #69957 (Different ways of handling div/mod by zero) 2015-06-28 18:22:59 +02:00
Jakub Zelenka 64c371142c Fix bug #62010 (json_decode produces invalid byte-sequences) 2015-06-28 17:16:12 +01:00
Jakub Zelenka 695b4f4cad Bump re2c version for json scanner 2015-06-28 16:48:42 +01:00
Bob Weinand b477aa1fad Fix bug #69952 (Dereferencing issue in session_start()) 2015-06-28 16:30:58 +02:00
Bob Weinand e96ad43ae6 Forgot to git add rope leak test 2015-06-28 15:44:53 +02:00
Bob Weinand 4a4529adb0 Fix rope memory leaks upon exception 2015-06-28 15:42:15 +02:00
Xinchen Hui f70950d004 Fixed ZEND_VM_DEFINE_OP build when --without-specializer 2015-06-28 21:16:08 +08:00
Xinchen Hui 15979d2c9e Merge branch 'master' of git.php.net:php-src 2015-06-28 19:17:37 +08:00
Xinchen Hui a486294e7d Unused ret 2015-06-28 19:16:00 +08:00
Anatol Belski 7d0fb66032 updated NEWS 2015-06-28 13:13:41 +02:00
Cameron Porter 621698d3f9 Correct oci8 hash destructors to prevent segfaults, and a few other fixes. 2015-06-28 13:05:25 +02:00
Anatol Belski b81188518b tweak the zendparse symbol to be exported with newer bison 2015-06-28 00:10:41 +02:00
Anatol Belski 2eea8c1adb fix touching 2015-06-27 23:38:48 +02:00
Anatol Belski 84c4945599 touch all the files before creating a tarball 2015-06-27 22:06:15 +02:00
Anatol Belski 8858d02f63 fix one more bad char in the NEWS 2015-06-27 21:09:00 +02:00
Anatol Belski ea2ad6f6e4 remove BOM and a unicode char from the NEWS 2015-06-27 21:08:00 +02:00
Christoph M. Becker b06996b561 updated NEWS 2015-06-27 20:07:06 +02:00
Christoph M. Becker a7bbc68bac Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed #69655: php -S changes MKCALENDAR request method to MKCOL
2015-06-27 20:05:30 +02:00
Christoph M. Becker 7e97faa3e8 updated NEWS 2015-06-27 20:03:38 +02:00
Christoph M. Becker bbe28d3a55 Fixed #69655: php -S changes MKCALENDAR request method to MKCOL
The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.
2015-06-27 20:02:21 +02:00
Christoph M. Becker 1ec6ff0b49 Merge branch 'PHP-5.6'
* PHP-5.6:
  added skip condition for powershell requirement of test
2015-06-27 15:05:29 +02:00
Christoph M. Becker b811bb3920 added skip condition for powershell requirement of test 2015-06-27 15:02:52 +02:00
Christoph M. Becker 486d59dcfe updated NEWS 2015-06-27 14:38:37 +02:00
Christoph M. Becker 4e32ecb90a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #64878: 304 responses return Content-Type header
2015-06-27 14:35:20 +02:00
Christoph M. Becker 0730fc8830 updated NEWS 2015-06-27 14:32:34 +02:00
Christoph M. Becker 1920ba6f7b Fix #64878: 304 responses return Content-Type header
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
2015-06-27 14:28:33 +02:00
Christopher Jones 692d283707 Merge some fixes from Senthil. Some test diffs still remain. 2015-06-27 10:01:55 +10:00
Christopher Jones 7a9764c5bb Fix table name in initialization DROP TABLE statement 2015-06-27 10:01:15 +10:00
Tjerk Meesters 3bf012a98d Feature: Enhanced array_column() to also work with object elements. 2015-06-27 07:35:44 +08:00
Christoph M. Becker 86df85f43a Merge branch 'PHP-5.6'
* PHP-5.6:
  added regression test for bug #69679
2015-06-27 01:10:41 +02:00
Christoph M. Becker 6400ef192c added regression test for bug #69679
DOMDocument::loadHTML refuses to accept NULL bytes.
2015-06-27 01:08:56 +02:00
Christoph M. Becker 95459a4d16 Merge branch 'PHP-5.6'
* PHP-5.6:
  slightly revised bug69462.phpt
  Test for bug #69462
2015-06-26 23:27:25 +02:00
Christoph M. Becker bdf3bb668f slightly revised bug69462.phpt 2015-06-26 23:20:22 +02:00
Tomasz Sawicki af17316fcd Test for bug #69462
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
2015-06-26 23:19:29 +02:00
Bob Weinand 25e1b49ea1 Fix warning in zend_execute.c by explicit cast 2015-06-26 20:39:56 +02:00
Bob Weinand 2894bc5bb8 Use ZEND_INIT_STATIC_METHOD_CALL for literals of form "classname::method" 2015-06-26 19:55:13 +02:00
Aaron Piotrowski 1d704a05ee Fix closure leak test 2015-06-26 16:30:01 +02:00
Aaron Piotrowski 8bd95b8cdc Fix test duplication, add more tests 2015-06-26 16:30:01 +02:00
Christoph M. Becker 36e2d26adb restricted test to English locale (fails otherwise) 2015-06-26 16:27:45 +02:00
Christoph M. Becker 3bd6bb6f50 fixed broken test (syntax error in SKIPIF section) 2015-06-26 15:57:28 +02:00
Kalle Sommer Nielsen 4b737793bc Add test for bug #69939 2015-06-26 15:35:16 +02:00
Kalle Sommer Nielsen 85bbfb191d Fixed bug #69939 (Casting object to bool returns false) 2015-06-26 15:30:03 +02:00
Kalle Sommer Nielsen 3b589d8ca5 Merge branch 'master' of https://git.php.net/push/php-src 2015-06-26 10:24:45 +02:00
Bob Weinand 1335ebd068 Fix Closure leak in aborted INIT_DYNAMIC_FCALL 2015-06-26 05:10:58 +02:00
Aaron Piotrowski bc0df38e88 Added more indirect call tests, remove invalid test 2015-06-25 19:46:28 -05:00
Aaron Piotrowski ba67fc2218 Fix 'Class::method' indirect call with empty method name 2015-06-25 19:37:52 -05:00
Edgar R. Sandi 098a4cc3eb moved function warning test to money_format_error.phpt file 2015-06-25 20:34:41 -03:00
Tjerk Meesters 03a670eaaa Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
2015-06-26 06:03:29 +08:00
Tjerk Meesters 2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
Squashed commit of the following:

commit a64c1d9bc4c129fd946a478bdcb55101e42157b7
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.
2015-06-26 05:33:28 +08:00
Rasmus Lerdorf 7ceb47477d 3rd arg to stream_set_timeout is optional
ignore_user_abort() should take a bool not a string
2015-06-25 10:31:37 -07:00
Julien Pauli 20585beb76 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix unknown size of void error
2015-06-25 19:13:49 +02:00
Julien Pauli b1ec4515b0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix unknown size of void error
2015-06-25 19:13:20 +02:00
Anatol Belski 80f9a9725c fix unknown size of void error 2015-06-25 19:12:26 +02:00
Kalle Sommer Nielsen 7517d385ea Merge branch 'master' of https://git.php.net/push/php-src 2015-06-25 19:09:00 +02:00
Dmitry Stogov 2a2f42c25d Optimize out usless conditions used by specializer 2015-06-25 18:56:14 +03:00
Anatol Belski 04b26ba5c6 update the doc in regard to the latest discussions 2015-06-25 16:39:02 +02:00
Anatol Belski 0955f9513f Merge branch 'PHP-5.6'
* PHP-5.6:
  backport missing rev bfdc9e2805
2015-06-25 11:35:11 +02:00
Anatol Belski 7bb52dda6a backport missing rev bfdc9e2805 2015-06-25 11:34:04 +02:00
Dmitry Stogov f5fd58f737 Better check for __builtin_constant_p() availability 2015-06-25 12:02:28 +03:00
Dmitry Stogov 90976c9978 Moved test to correct place 2015-06-25 11:22:21 +03:00
Bob Weinand f42cdf83b0 Fix paths issue when fetching .phpdbginit under Windows 2015-06-25 00:36:01 +02:00
Ferenc Kovacs 190478e9da Merge remote-tracking branch 'origin/PHP-5.6'
* origin/PHP-5.6:
  5.6.12 next
2015-06-25 00:23:21 +02:00
Ferenc Kovacs 1efe5b1157 5.6.12 next 2015-06-25 00:21:45 +02:00
Hannes Magnusson 4a6503a524 Typo (thanks kaplan@) 2015-06-24 08:24:11 -07:00
Xinchen Hui 2a9e012aa5 Merge branch 'master' of git.php.net:php-src 2015-06-24 21:44:31 +08:00
Xinchen Hui fa61f921f9 Micro optimization 2015-06-24 21:42:54 +08:00
Bob Weinand ab90e55b9e Passing a zend_string * to %s is a bad idea 2015-06-24 15:29:26 +02:00
Julien Pauli 2424b349ad Merge branch 'PHP-5.6'
* PHP-5.6:
  5.5.28 now - Security Only
2015-06-24 10:45:42 +02:00
Julien Pauli ca82114f21 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.28 now - Security Only

Conflicts:
	configure.in
	main/php_version.h
2015-06-24 10:42:41 +02:00
Julien Pauli 8e440dc1d7 5.5.28 now - Security Only 2015-06-24 10:41:06 +02:00
Anatol Belski e821a13a4d fix NEWS 2015-06-24 10:21:54 +02:00
Rasmus Lerdorf 1201be392f 3rd arg to define() is optional 2015-06-23 23:53:23 -04:00
Rasmus Lerdorf 56b0d6f3a0 Wrong arginfo on assert
(not adding types, just fixing a missing arg)
2015-06-23 22:41:41 -04:00
Hannes Magnusson 517196b065 PHP7 sounds like a good time to include signatures in announce mails
We need these posted as many places as possible to make any sense.
2015-06-23 19:33:37 -07:00
Hannes Magnusson ce01d7361e space 2015-06-23 19:29:10 -07:00
Christoph M. Becker d90763d4c6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Made bug44295-win.phpt locale independent
2015-06-24 02:04:34 +02:00
Christoph M. Becker c201b63873 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Made bug44295-win.phpt locale independent
2015-06-24 01:42:22 +02:00
Christoph M. Becker cd068b1ed6 Made bug44295-win.phpt locale independent
Formerly it failed on non English installations.
2015-06-24 01:41:33 +02:00
Christoph M. Becker 27e557a169 Merge branch 'master' of https://git.php.net/repository/php-src
# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src:
  Fix more proto comments
  prepare NEWS for next
  Fix more minor mistakes in the proto comments
  Avoid op_num = -1 in unfinished generator cleanup
  Fix incorrect protos
2015-06-24 01:15:44 +02:00
Christoph M. Becker 7464424776 updated NEWS 2015-06-24 00:54:20 +02:00
Christoph M. Becker 00adcbd3e9 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
2015-06-24 00:47:18 +02:00
Christoph M. Becker e181931f77 updated NEWS 2015-06-24 00:42:24 +02:00
Christoph M. Becker 905c5f4858 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
2015-06-24 00:32:13 +02:00
Christoph M. Becker b03f743e7d updated NEWS 2015-06-24 00:31:07 +02:00
Christoph M. Becker 8da8dc04b6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
2015-06-24 00:23:39 +02:00
Christoph M. Becker 921544cad9 updated NEWS 2015-06-24 00:20:32 +02:00
Christoph M. Becker a621781fdb Fixed bug #69768 (escapeshell*() doesn't cater to !)
When delayed variable substitution is enabled (can be set in the
Registry, for instance), !ENV! works similar to %ENV%, and so ! should
be escaped like %.
2015-06-24 00:15:55 +02:00
Rasmus Lerdorf 28d7bb97a1 Fix more proto comments 2015-06-23 17:46:20 -04:00
Anatol Belski 2d2bd2db97 prepare NEWS for next 2015-06-23 22:26:11 +02:00
Rasmus Lerdorf 41774bceff Fix more minor mistakes in the proto comments 2015-06-23 15:47:33 -04:00
Nikita Popov ea5c66ec93 Avoid op_num = -1 in unfinished generator cleanup
Also add two tests showing that the -1 substraction in the
computation of op_num is really necessary.
2015-06-23 20:17:30 +02:00
Rasmus Lerdorf f4d08d8e5c Fix incorrect protos 2015-06-23 14:15:24 -04:00
Christoph M. Becker e08d27d650 updated NEWS 2015-06-23 19:44:22 +02:00
Christoph M. Becker ca049e0ae9 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:41:02 +02:00
Christoph M. Becker 13347225ac updated NEWS 2015-06-23 19:36:59 +02:00
Anatol Belski 9876b2c2cf sync NEWS 2015-06-23 19:33:33 +02:00
Anatol Belski 5ea2b70645 bump version 2015-06-23 19:32:58 +02:00
Christoph M. Becker e1561c490e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
2015-06-23 19:32:57 +02:00
Christoph M. Becker 1cbcbcbc21 updated NEWS 2015-06-23 19:32:18 +02:00
Christoph M. Becker 23e25f3319 Fixed Bug #53823 (preg_replace: * qualifier on unicode replace garbles the string)
When advancing after empty matches, php_pcre_match_impl() as well as
php_pcre_replace_impl() always have to advance to the next code point when the
u modifier is given, instead of to the next byte.
2015-06-23 19:28:09 +02:00
Anatol Belski 29711264a8 Merge branch 'master' into PHP-7.0.0
* master: (239 commits)
  Moved NEWS entry for bug #69864 to proper category
  Moved NEWS entry for bug #69864 to proper category
  Moved NEWS entry for bug #69864 to proper category
  updated NEWS
  updated NEWS
  Fixed two errors in LDAP tests
  Fixed two errors in LDAP tests
  Revert "Simplify php_implode(). Fill the resulting string in direct order." The patch slightly improved performance of string imploding, but reduced speed of integers imploding.
  Encapsulate FastCGI implementation details. Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
  Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER)
  updated NEWS
  Fixed bug #69864 (Segfault in preg_replace_callback)
  Simplify php_implode(). Fill the resulting string in direct order.
  bump API version to 6.8
  bump API version to 6.8
  bump API version to 6.8
  Drop duplicate object-to-type notices
  Added comments
  Drop superfluous __toString handling code
  This macro is defined in zend_virtual_cwd.h, avoid redef
  ...
2015-06-23 18:49:42 +02:00
Christoph M. Becker 95b6575a59 Moved NEWS entry for bug #69864 to proper category 2015-06-23 17:34:33 +02:00
Christoph M. Becker b29d822e08 Merge branch 'PHP-5.6'
* PHP-5.6:
  Moved NEWS entry for bug #69864 to proper category
  Moved NEWS entry for bug #69864 to proper category
2015-06-23 17:32:47 +02:00
Christoph M. Becker 868b9328a0 Moved NEWS entry for bug #69864 to proper category 2015-06-23 17:30:31 +02:00
Christoph M. Becker b883fe1547 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Moved NEWS entry for bug #69864 to proper category
2015-06-23 17:28:22 +02:00
Christoph M. Becker eef6b10b7c Moved NEWS entry for bug #69864 to proper category 2015-06-23 17:27:21 +02:00
Christoph M. Becker 6f0afee301 updated NEWS 2015-06-23 16:52:14 +02:00
Christoph M. Becker ec8731c46b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23 16:50:52 +02:00
Côme Bernigaud 5250fc772d Removed deprecated function calls from ldap module
ldap_search -> ldap search_ext
ldap_search_s ->_ldap_search_ext_s
ldap_add_s -> ldap_add_ext_s
ldap_delete_s -> ldap_delete_ext_s
ldap_compare_s -> ldap_compare_ext_s
ldap_value_free -> ldap_memvfree

Only thing left is ldap_sort_entries, no replacement
2015-06-23 16:44:48 +02:00
Christoph M. Becker 7953ff4ea3 updated NEWS 2015-06-23 16:43:12 +02:00
Christoph M. Becker bc47f10a97 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #69864 (Segfault in preg_replace_callback)
2015-06-23 16:36:35 +02:00
Christoph M. Becker b559cc98ba Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed two errors in LDAP tests
  bump API version to 6.8
  bump API version to 6.8
2015-06-23 16:24:06 +02:00
Christoph M. Becker 3e1aabbfc3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  bump API version to 6.8
2015-06-23 16:22:08 +02:00
Côme Bernigaud d29cc63bb6 Fixed two errors in LDAP tests 2015-06-23 16:11:12 +02:00
Côme Bernigaud 9bcdd2aabe Fixed two errors in LDAP tests 2015-06-23 16:09:56 +02:00
Côme Bernigaud ea49be9b37 Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning 2015-06-23 15:50:14 +02:00
Dmitry Stogov 6bf3ecf69a Revert "Simplify php_implode(). Fill the resulting string in direct order."
The patch slightly improved performance of string imploding, but reduced speed of integers imploding.

This reverts commit 36d39b7044.
2015-06-23 16:46:41 +03:00
Dmitry Stogov f0d2a0e542 Encapsulate FastCGI implementation details.
Previously fcgi_request defined in main/fastcgi.h might be treated differently in different files, because of different behavior of #ifdef TCP_NODELAY. This leaded to stack memory corruption and unpredictable crashes.
2015-06-23 16:27:21 +03:00
Dmitry Stogov 7a01c44ab2 Fixed bug #69905 (null ptr deref and segfault in ZEND_FETCH_DIM_RW_SPEC_VAR_UNUSED_HANDLER) 2015-06-23 16:26:40 +03:00
Kalle Sommer Nielsen 6129a56c02 Merge branch 'master' of https://git.php.net/push/php-src 2015-06-23 13:39:12 +02:00
Christoph M. Becker 75b2ce28aa updated NEWS 2015-06-23 13:02:08 +02:00
Christoph M. Becker a39beaa251 Fixed bug #69864 (Segfault in preg_replace_callback)
When preg_replace_callback() is used, cache entries which are in use must not
be removed. We ensure that by deploying a simple refcounting mechanism.
2015-06-23 13:00:17 +02:00
Dmitry Stogov 36d39b7044 Simplify php_implode(). Fill the resulting string in direct order. 2015-06-23 12:57:36 +03:00
Kalle Sommer Nielsen 77eb51bffd Merge branch 'master' of https://git.php.net/push/php-src 2015-06-23 11:19:31 +02:00
George Wang 9e15ce9a38 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2015-06-22 23:40:34 -04:00
George Wang b0954ebb79 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2015-06-22 23:39:53 -04:00
George Wang 3a169f6c0d bump API version to 6.8 2015-06-22 23:39:35 -04:00
George Wang 8877feaeec bump API version to 6.8 2015-06-22 23:39:23 -04:00
George Wang fdb580a5ad bump API version to 6.8 2015-06-22 23:38:38 -04:00
George Wang 2423b0bded bump API version to 6.8 2015-06-22 23:35:21 -04:00
Nikita Popov 8a83aed458 Drop duplicate object-to-type notices
We already generate a recoverable fatal for these earlier, no need
to throw an additional notice.
2015-06-22 16:25:32 +02:00
Dmitry Stogov d4cd659b5a Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Drop superfluous __toString handling code
2015-06-22 17:07:25 +03:00
Dmitry Stogov 567aa1783e Added comments 2015-06-22 16:39:07 +03:00
Nikita Popov 628d439402 Drop superfluous __toString handling code
This is already covered by the cast_object invokation above it. We
do not use this kind of fallback in any other casting code anymore.
2015-06-22 15:33:41 +02:00
Kalle Sommer Nielsen 41404bfafd Also silence copy here 2015-06-22 15:26:21 +02:00
Kalle Sommer Nielsen 4807b164fd This macro is defined in zend_virtual_cwd.h, avoid redef 2015-06-22 14:02:04 +02:00
Kalle Sommer Nielsen 093546308e Silence the "1 file(s) copied" notice (from copying the manifest file) 2015-06-22 13:56:35 +02:00
Kalle Sommer Nielsen f40b41d0c8 Merge branch 'master' of https://git.php.net/push/php-src 2015-06-22 13:39:17 +02:00
Kalle Sommer Nielsen 055755a4ae Fix typo + DSP reference 2015-06-22 13:30:12 +02:00
Kalle Sommer Nielsen db22946b25 Remove these old references to the DSP files we don't use anymore 2015-06-22 13:29:42 +02:00
Bob Weinand 70e86b8766 Also try __has_builtin() where builtins are used 2015-06-22 13:24:39 +02:00
Bob Weinand 29aad0ef45 Add phpdbg userland API to fetch oplog
We may want to add some opcode info later, so that "opcodes" mode is more helpful
2015-06-22 12:58:33 +02:00
Dmitry Stogov 44d545b8e1 Avoid overhead in RELEASE build. 2015-06-22 13:08:33 +03:00
Dmitry Stogov b97df475df Fixed crash in Zend/tests/bug69891.phpt on x86 (32-bit).
compare_function() now has to be compatible with binary_op_type (use fastcall convention).
Introduced new zval_compare_function() to be used as zval comparison callback instead of compare_function().
2015-06-22 12:53:52 +03:00
Kalle Sommer Nielsen 0da4c34f0e Fixed bug #69897 (segfault when manually constructing SQLite3Result) 2015-06-22 11:12:23 +02:00
Dmitry Stogov ed418312a5 Revert "Fix arginfo for built-in engine functions"
This reverts commit d2356541d0.
2015-06-22 11:44:57 +03:00
Dmitry Stogov 3db071dba2 Revert "Fix set_error_handler() arginfo"
This reverts commit b5240280b0.
2015-06-22 11:44:49 +03:00
Dmitry Stogov 82b92cfa2e Revert "And actually use this new arginfo data"
This reverts commit 932c95fb31.
2015-06-22 11:44:39 +03:00
Dmitry Stogov 539593ce15 Revert "Fix each() arginfo"
This reverts commit 19fd124bcf.
2015-06-22 11:44:29 +03:00
Dmitry Stogov 9a68fe51d7 Revert "Fix genarginfo to respect by-ref passing"
This reverts commit db6990a91b.
2015-06-22 11:44:13 +03:00
Dmitry Stogov 13d5893c2a Revert "Several return type fixes, still not completed... Incomplete prototypes :-/"
This reverts commit 851b95fc49.
2015-06-22 11:44:01 +03:00
Bob Weinand 851b95fc49 Several return type fixes, still not completed... Incomplete prototypes :-/ 2015-06-22 10:36:42 +02:00
Bob Weinand db6990a91b Fix genarginfo to respect by-ref passing 2015-06-22 10:17:35 +02:00
Bob Weinand 19fd124bcf Fix each() arginfo 2015-06-22 10:03:14 +02:00
Rasmus Lerdorf 932c95fb31 And actually use this new arginfo data 2015-06-22 00:12:48 -04:00
Rasmus Lerdorf b5240280b0 Fix set_error_handler() arginfo 2015-06-21 23:48:00 -04:00
Rasmus Lerdorf d2356541d0 Fix arginfo for built-in engine functions 2015-06-21 21:50:09 -04:00
Bob Weinand 5314f13fc6 Fix accidental function related flag value reuse 2015-06-22 01:36:17 +02:00
Bob Weinand 3c288b12b4 Fix bad run_time_cache with Closure::call()
This also fixes a memory "leak" (memory is allocated on unbounded arena without limits) on each new Closure instantiation.
Closures with same scope now all share the same run_time_cache (as long as it is arena allocated)
2015-06-21 16:39:44 +02:00
Jakub Zelenka f3df3df873 Fix bug #68546 (json_decode cannot access property started with \0) 2015-06-21 15:30:33 +01:00
Bob Weinand 115e9288bb Fix segfault with scalar passed to typehint with not loaded class 2015-06-21 01:35:22 +02:00
Nikita Popov f58ebb3609 Load/restore VM stack before unfinished generator cleanup 2015-06-20 19:09:25 +02:00
Bob Weinand ffe0f470d6 Fix bad test (oops) 2015-06-20 18:59:47 +02:00
Nikita Popov 6a4877ee17 Add test for previous commit 2015-06-20 18:38:59 +02:00
Nikita Popov ddf41d3aeb Fix generator memory leak
Make sure HANDLE_EXCEPTION and generator unwinds stay in sync in
the future by extracting a common function.
2015-06-20 18:37:28 +02:00
Bob Weinand 7adc0ae631 Fix potential writes into wrong memory, ensure vm_stack integrity
Fixes also a segfault on stack frames > 1 << 18 bytes
Stack frames, when reallocated, need to be marked as top frame of current stack page
2015-06-20 18:29:09 +02:00
Nikita Popov 23e1e1295f Clean up zend_hash_compare implementation
Split off zend_hash_compare_impl into separate function that does
not bother with recursion protection. We had two cases where
UNPROTECT_RECURSION was missing.
2015-06-20 17:35:16 +02:00
Nikita Popov e8217a2727 Fix bug #69891 2015-06-20 17:23:58 +02:00
Nikita Popov 5bf7a3aac7 Fixed bug #69893 2015-06-20 17:14:48 +02:00
Nikita Popov 9589d26ef3 Merge branch 'PHP-5.6'
Conflicts:
	Zend/zend_hash.c
2015-06-20 16:50:37 +02:00
Nikita Popov e09d3155a1 Merge branch 'PHP-5.5' into PHP-5.6 2015-06-20 16:40:53 +02:00
Nikita Popov 5fe078abba Fixed bug #69892 2015-06-20 16:40:14 +02:00
Kalle Sommer Nielsen cc8f2b1bd9 Add missing NEWS entries 2015-06-20 15:24:51 +02:00
Nikita Popov 9fa70dbd29 Fixed bug #69889
There is one case that requires further discussion:

$foo = "test";
var_dump($foo[0.0] ?? "default");
var_dump(isset($foo[0.0]) ? $foo[0.0] : "default");

Here the former will currently return "t", while the latter also
returns "t" and additionally throws a notice.

I think we need to revisit the behavior of invalid types for string
offset access in PHP 7, as currently there is some mismatch between
what isset() does and what the access itself supports.
2015-06-20 15:09:58 +02:00
Nikita Popov 257054e81d Fix bug #62922
Off by one error...
2015-06-20 14:39:55 +02:00
Nikita Popov c7f4c5a2fe Avoid unnecessary separations in VERIFY_RETURN_TYPE 2015-06-20 14:12:59 +02:00
Nikita Popov a684e6adb2 Drop unnecessary %prec
Leftover from a previous implementation
2015-06-20 13:10:51 +02:00
Anatol Belski f801eb9d6b updated NEWS 2015-06-20 09:35:03 +02:00
Anatol Belski 658d698a1c add test for bug #69838 2015-06-20 09:35:02 +02:00
Anatol Belski f88aad418e Fix bug #69838 OPCACHE Warning Internal error: wrong size calculation
This chunk is pre calculated with aligned size, so should it use it
at run time.
2015-06-20 09:35:01 +02:00
Xinchen Hui f75308eda1 Micro optimization 2015-06-20 10:52:58 +08:00
Xinchen Hui dc72b70b7e Remove unused var 2015-06-20 10:37:53 +08:00
Xinchen Hui 89fda08473 This test should be kept 2015-06-19 23:13:23 +08:00
Xinchen Hui 307c734bed Better way to fix (Fix bug #69871 (short-circuiting failure with smart_branch)) 2015-06-19 23:05:35 +08:00
Xinchen Hui 235c7edb8b Revert "Fix bug #69871 (short-circuiting failure with smart_branch)"
This reverts commit fae6bedea5.
2015-06-19 23:03:23 +08:00
Xinchen Hui a7635e82f6 Improve strtr (Fixed a bug which the lenth check doesn't work at all) 2015-06-19 22:59:31 +08:00
Kalle Sommer Nielsen cff872eaad Remove the references to imageps*() after the T1Lib removal (Noticed by Ferenc) 2015-06-19 14:55:10 +02:00
Xinchen Hui 05c24d5dfa Fixed Bug #69883 (Compilation failed on PCRE) 2015-06-19 20:33:14 +08:00
Anatol Belski 1e65b65dd6 more precise way to destroy iterator object
which also fixes the iterator_to_array test
2015-06-19 14:23:32 +02:00
Anatol Belski d81480693c updated NEWS 2015-06-19 12:48:14 +02:00
Anatol Belski 9649cec2a3 added test for bug #69846 2015-06-19 12:46:19 +02:00
Dominic 9c07ae6341 Cleaned white spaces in PHP_INI definition of phar
Removes unnecessary white spaces.
2015-06-19 12:31:03 +02:00
Anatol Belski d079a1c9ea better approach to fix bug #69846
don't destroy the current iterator object too early
2015-06-19 11:22:12 +02:00
Yasuo Ohgaki d263ecd864 Move strlen() check to php_mail_detect_multiple_crlf() 2015-06-19 15:17:56 +09:00
Yasuo Ohgaki dacea3f6fb Fixed Bug #69874 : Can't set empty additional_headers for mail() 2015-06-19 12:19:12 +09:00
Xinchen Hui bb4454b513 Merge branch 'master' of git.php.net:php-src 2015-06-19 09:57:48 +08:00
Xinchen Hui 327e3b338c Micro optimizations for pcre 2015-06-19 09:56:42 +08:00
Bob Weinand e58a1abb00 Fix memory leak (double copy) in SplPriorityQueue 2015-06-19 03:42:59 +02:00
Xinchen Hui 29087f00f6 Merge branch 'PHP-5.6' 2015-06-19 09:36:27 +08:00
Xinchen Hui bca005c8d9 Merge branch 'PHP-5.5' into PHP-5.6 2015-06-19 09:35:52 +08:00
Xinchen Hui 6a8db93115 Merge branch 'patch-3' of https://github.com/s0ph1e/php-src into PHP-5.5 2015-06-19 09:35:28 +08:00
Anatol Belski cdde1be056 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs
2015-06-18 22:05:07 +02:00
Anatol Belski 076a64524f update NEWS 2015-06-18 22:04:55 +02:00
Anatol Belski 962fe01473 update NEWS 2015-06-18 22:04:03 +02:00
Anatol Belski 657f93e7b9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs
2015-06-18 22:03:28 +02:00
Anatol Belski c0119ca7f3 updated NEWS 2015-06-18 22:02:37 +02:00
Christian Wenz a85156db7d fixes bug #69835: phpinfo() does not report many Windows SKUs 2015-06-18 22:01:20 +02:00
Anatol Belski 918de41ec2 partial fix to bug #69846 2015-06-18 20:17:04 +02:00
Sophia Nepochataya 1edb2e9a10 Remove excess variable in mail.c (5.5 branch) 2015-06-18 20:06:08 +03:00
Kalle Sommer Nielsen d9d1948396 Minor updates to EXTENSIONS for removed SAPIS etc that I remembered off my head, also add Côme as a maintainer for ldap as per request[1].
[1] http://news.php.net/php.internals/86747
2015-06-18 17:22:22 +02:00
Ferenc Kovacs ff3ee75d91 add a freshly built pear/install-pear-nozlib.phar. created from the current stable branch of pear-core and using the trunk from PHP_Archive where the ereg_ calls are removed already 2015-06-18 16:46:22 +02:00
Lior Kaplan 7a02d138a6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:36:46 +03:00
Lior Kaplan 3930e1f2fa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:35:54 +03:00
Lior Kaplan ca33ae3eb2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #69689 (Align PCRE_MINOR with current version)
2015-06-18 17:34:53 +03:00
Xinchen Hui d54e6f015b Merge branch 'master' of git.php.net:php-src 2015-06-18 22:30:35 +08:00
Lior Kaplan cc7194dd10 Fixed bug #69689 (Align PCRE_MINOR with current version) 2015-06-18 17:30:21 +03:00
Xinchen Hui 20f3416682 Fixed bug #69872 (uninitialised value in strtr with array) 2015-06-18 22:28:29 +08:00
Bob Weinand fae6bedea5 Fix bug #69871 (short-circuiting failure with smart_branch) 2015-06-18 15:59:00 +02:00
Lior Kaplan 846d0e6fd9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add CVE to bugs #69545, #69646 and #69667
2015-06-18 16:57:04 +03:00
Lior Kaplan 811816dc25 Add CVE to bugs #69545, #69646 and #69667 2015-06-18 16:56:06 +03:00
Lior Kaplan 0f49c205f4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add CVE to bugs #69545, #69646 and #69667
2015-06-18 16:52:51 +03:00
Lior Kaplan 991b2cc37b Add CVE to bugs #69545, #69646 and #69667 2015-06-18 16:51:20 +03:00
Lior Kaplan 189af22cf0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add CVE to bugs #69545, #69646 and #69667
2015-06-18 15:50:11 +03:00
Lior Kaplan 5f67caad54 Add CVE to bugs #69545, #69646 and #69667 2015-06-18 15:45:10 +03:00
Xinchen Hui 7cde797ecb Update NEWS 2015-06-18 19:59:15 +08:00
Xinchen Hui 509d75527a Fixed Conditional jump or move depends on uninitialised value(s)
reproduced by Bug #69868's test script
2015-06-18 19:56:50 +08:00
Xinchen Hui c58c5e779a Fixed bug #69868 (Invalid read of size 1 in zend_compile_short_circuiting) 2015-06-18 19:53:26 +08:00
Xinchen Hui eca7f28796 Fixed typo 2015-06-18 13:22:39 +08:00
Xinchen Hui d8c9b1f7ad Seems UPGRADING is not merged... 2015-06-18 13:12:01 +08:00
Aaron Piotrowski 4fb362704c Add tests with invalid Error construction params 2015-06-17 19:49:02 -05:00
Aaron Piotrowski 8813b389ea Fix bug when constructing an Error with invalid params 2015-06-17 19:48:17 -05:00
Anatol Belski f97dbb058f cleanup unused var 2015-06-18 00:53:23 +02:00
Anatol Belski e665b27623 fix c/p test title 2015-06-18 00:33:16 +02:00
Anatol Belski 577c1f3e95 preserve the orig class name when extending the ErrorException 2015-06-18 00:30:16 +02:00
Anatol Belski 9076eb26c7 dont use function to fetch default exception ce 2015-06-18 00:21:38 +02:00
Anatol Belski 8486505651 more tests 2015-06-18 00:15:34 +02:00
Anatol Belski 57940664a8 fix crash when invalid exception arguments passed 2015-06-18 00:14:57 +02:00
Anatol Belski bfdc9e2805 fix unknown size of void error 2015-06-17 23:43:13 +02:00
Sara Golemon 51a259f378 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix buffer growth in sockets/conversion.c
  Implements extended error messages
2015-06-17 13:34:42 -07:00
Sara Golemon c4dd65c723 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix buffer growth in sockets/conversion.c
2015-06-17 13:34:33 -07:00
Sara Golemon d241711f44 Fix buffer growth in sockets/conversion.c
memset() the *end* of the new buffer, not the beginning
Copy the pointer to the buffer, not its initial contents

Fixes bug 69619
2015-06-17 13:34:20 -07:00
Christoph M. Becker 653c869348 Fix #61362: Exception::getTraceAsString and ::__toString scramble Unicode
The logic in smart_str_append_escaped() relies on unsigned values of c, so we
have to declare it as such.
2015-06-17 22:31:07 +02:00
Anatol Belski 269acaa363 Merge branch 'pull-request/1284'
* pull-request/1284:
  Rename interface macros
  Fix typo in UPGRADING
  Move definition of Throwable to zend_exceptions.h/c
  Check for zend_ce_throwable instead
  Fix some missed tests
  Add Throwable tests
  Fix previous exception type check
  Updated UPGRADING with RFC link
  Changed AssertionException to AssertionError
  Update exception error messages
  Throwable method signatures.
  Update exception names in tests after formatting changes.
  Merge exception formatting changes.
  Make zend_get_exception_base static.
  Fix a few missed tests.
  Fix handler double copy.
  Updated tests to reflect exception class changes.
  Remodel exceptions based on Throwable interface
2015-06-17 21:55:03 +02:00
Aaron Piotrowski c5eb924e9e Rename interface macros
Renamed REGISTER_INTERFACE (formerly
REGISTER_ITERATOR_INTERFACE) to
REGISTER_MAGIC_INTERFACE and renamed
REGISTER_ITERATOR_IMPLEMENT to
REGISTER_MAGIC_IMPLEMENT. Both have now been
moved to zend_interfaces.h.
2015-06-17 13:54:09 -05:00
Aaron Piotrowski 47fda68b03 Fix typo in UPGRADING 2015-06-17 13:28:27 -05:00
Andreas Heigl eb702637a9 Implements extended error messages
This commit introduces a new constant that can be used to retrieve more
detailed error messages.

This fixes #47222

The new constant LDAP_OPT_DIAGNOSTIC_MESSAGE is defined in PHP when the
underlying library provides (and understands) it. This is the case in
the current OpenLDAP-implementation.

Tanks to Johnny Willer who provided the solution at http://stackoverflow.com/questions/28765077/get-number-of-ad-errors-with-ldap-and-php-ldap-function-return-unprecise-error/28816473#28816473
2015-06-17 15:39:07 +02:00
Xinchen Hui 7db113fad1 Merge branch 'master' of git.php.net:php-src 2015-06-17 21:17:04 +08:00
Xinchen Hui cdb9de1076 Merge branch 'gitignore' of https://github.com/flaupretre/php-src 2015-06-17 21:14:44 +08:00
Côme Bernigaud 78fe52475f Merge branch 'PHP-5.6'
* PHP-5.6:
  Replaced calls to deprecated openldap functions
  Fixed LDAP tests so that base can exists

Conflicts:
	ext/ldap/ldap.c
2015-06-17 15:08:47 +02:00
Côme Bernigaud e7af0fe1eb Replaced calls to deprecated openldap functions
ldap_unbind_s   -> ldap_unbind_ext
389             -> LDAP_PORT
ldap_init       -> ldap_initialize
ldap_bind_s     -> ldap_sasl_bind_s
ldap_value_free -> ber_memvfree
Also added ldap_is_ldap_url check
2015-06-17 14:36:38 +02:00
Côme Bernigaud a5629f8845 Fixed LDAP tests so that base can exists
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:55:13 +02:00
Côme Bernigaud 8836404faf Fixed LDAP tests so that base can exists
Now you can set the base in the env var LDAP_TEST_BASE.
The base has to exists. (before tests were attempting to create/delete
the base itself)
2015-06-17 13:50:14 +02:00
Christoph M. Becker c9554b90e4 added regression test for bug #69840 2015-06-17 13:40:19 +02:00
Francois Laupretre 0683255dad Add missing path to .gitignore 2015-06-17 12:45:41 +02:00
Dmitry Stogov 4a6e1345e2 Use COW to prevent unnecessary duplication of dynamic propertyes of stdClass (and other classes without predefined properties). 2015-06-17 12:50:16 +03:00
Xinchen Hui e011e6fdf4 Add a comment 2015-06-17 17:33:55 +08:00
Dmitry Stogov a524a375d9 Improved class type hints checks, by caching resolved class entries in run-time cache. 2015-06-17 12:07:43 +03:00
Dmitry Stogov 8c8ad8f40e Use better hash functions (reuse key and avoid hash value recalculation) 2015-06-17 12:06:33 +03:00
Dmitry Stogov a0b3fd7803 Improved variable name validation 2015-06-17 12:05:58 +03:00
Kalle Sommer Nielsen ff9e290438 Fixed bug #69840 (iconv_substr() doesn't work with UTF-16BE) 2015-06-17 09:39:45 +02:00
Christoph M. Becker 3697f02212 updated NEWS 2015-06-17 02:27:05 +02:00
Christoph M. Becker 455c7c8e26 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:25:46 +02:00
Christoph M. Becker e4917bc747 updated NEWS 2015-06-17 02:20:14 +02:00
Christoph M. Becker 7958a7b38f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #61221 - imagegammacorrect function loses alpha channel
2015-06-17 02:18:53 +02:00
Christoph M. Becker 61d58f2d9e updated NEWS 2015-06-17 02:17:40 +02:00
Christoph M. Becker 7469c7e7d0 Fixed bug #61221 - imagegammacorrect function loses alpha channel
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-17 02:15:59 +02:00
Bob Weinand 28756e99be Fix issue with zend_execute_ex replaced by execute_ex upon icall 2015-06-16 23:37:39 +02:00
Bob Weinand 8c4807fe7a Fix infinite loop when running phpdbg via -r(r) 2015-06-16 23:37:39 +02:00
Nikita Popov fb346c8f93 Support references in convert_to_*
conver_to_* functions now accept REFERENCE values, which will be
unwrapped before performing the usual conversion. This is consistent
with convert_scalar_to_number and matches the expected behavior in
a couple random use-sites I checked.

Also includes a couple fixes/cleanups elsewhere and two tests for
cases that previously didn't work (though the reference issue existed
all over the place).
2015-06-16 19:55:33 +02:00
Nikita Popov 4448843b7c Move check for CT div by zero into common function 2015-06-16 18:09:59 +02:00
Nikita Popov 183c00ddb6 Fix references handling in convert_scalar_to_number 2015-06-16 18:02:45 +02:00
Nikita Popov 44b7489fef Drop now superflous check for VIA_TRAMPOLINE
This is not handled by USE_ARG_INFO.
2015-06-16 17:51:18 +02:00
Bob Weinand 52e9a772a3 Fully fixing all the affected const expr cases (see bug #69832) 2015-06-16 16:53:30 +02:00
Dmitry Stogov 3e57e50fb0 Removed useless #ifdef 2015-06-16 17:17:49 +03:00
Kalle Sommer Nielsen 4445268281 Fixed bug #69849 (Broken output of apache_request_headers) 2015-06-16 16:11:21 +02:00
Kalle Sommer Nielsen ab4aae5fd7 Use zend_parse_parameters_none() here 2015-06-16 15:15:27 +02:00
Dmitry Stogov 48ed660cdf Make CALL VM with FP and IP in global registers not to return anything from opcode handlers.
Set OPLINE to NULL to terminate VM loop instead.
This saves 1 CPU instruction for each opcode handler.
2015-06-16 14:11:16 +03:00
Dmitry Stogov 3180b8e100 Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class name) (onr more problem) 2015-06-16 13:29:17 +03:00
Dmitry Stogov ed84bff445 Complete fix for problems related to bug #69802 2015-06-16 11:24:35 +03:00
Dmitry Stogov 6ae375db31 Fixed bug #69845 (ArrayObject with ARRAY_AS_PROPS broken) 2015-06-16 10:53:53 +03:00
Xinchen Hui dc329cd5dc Make the tail slash algined 2015-06-16 11:33:44 +08:00
Dreamsxin 73031d92ce Fix invalid conversion about emalloc 2015-06-16 11:12:37 +08:00
Aaron Piotrowski 47d838a7ca Move definition of Throwable to zend_exceptions.h/c
Also moved REGISTER_ITERATOR_INTERFACE macro to
zend_interfaces.h and renamed it to REGISTER_INTERFACE.
2015-06-15 18:07:27 -05:00
Aaron Piotrowski 0265cf5aeb Check for zend_ce_throwable instead 2015-06-15 17:35:24 -05:00
Andrew Smith 60e658be81 Remove incorrect use of 'irregardless'
Correct word should be simply regardless
2015-06-16 00:31:37 +02:00
Bob Weinand 9db81340ba Fix bug #69832 (Assertion failure) 2015-06-15 17:43:09 +02:00
Xinchen Hui 556423fcd0 Add an entry for dc37d3e8c2 2015-06-15 23:19:32 +08:00
Xinchen Hui 20597ecfb7 Fixed print_ht 2015-06-15 22:31:01 +08:00
Aaron Piotrowski 77cf6d81b4 Fix some missed tests 2015-06-15 08:20:30 -05:00
Dmitry Stogov 33e71d5c20 Fixed bug #69802 (Reflection on Closure::__invoke borks type hint class name) 2015-06-15 15:44:44 +03:00
Dmitry Stogov 562bffe60e Few more lines about opcache file cache. 2015-06-15 14:44:21 +03:00
Dmitry Stogov ae88a243e4 Rmoved opcache.load_comments. 2015-06-15 14:01:26 +03:00
Dmitry Stogov ea14c20ffb Added notes about opcahce.file_cache. 2015-06-15 13:39:45 +03:00
Bob Weinand 6e3e1e31e9 Add phpdbg to allowed cli-SAPIs in opcache 2015-06-15 12:31:46 +02:00
Dmitry Stogov 0a21a0c752 Removed opcache.load_comments configuration directive. Now doc comments loading costs nothing and always enabled. 2015-06-15 13:18:52 +03:00
Derick Rethans 7eae1cc2ce - Updated to version 2015.5 (2015e) 2015-06-15 10:41:32 +01:00
Derick Rethans 8167a4b460 Empty merge 2015-06-15 10:41:31 +01:00
Derick Rethans c661e7680f - Updated to version 2015.5 (2015e) 2015-06-15 10:41:30 +01:00
Derick Rethans 76c3117af5 Empty merge 2015-06-15 10:41:30 +01:00
Derick Rethans 558342124e - Updated to version 2015.5 (2015e) 2015-06-15 10:41:29 +01:00
Derick Rethans 37e3d92d64 - Updated to version 2015.5 (2015e) 2015-06-15 10:28:26 +01:00
Derick Rethans f8a8a2b70a Empty merge 2015-06-15 10:28:25 +01:00
Derick Rethans 22a43410cb - Updated to version 2015.5 (2015e) 2015-06-15 10:28:23 +01:00
Derick Rethans dab34e2433 Empty merge 2015-06-15 10:28:23 +01:00
Derick Rethans 9026a66579 - Updated to version 2015.5 (2015e) 2015-06-15 10:28:22 +01:00
Derick Rethans 40e1ef15be - Updated to version .-96 () 2015-06-15 10:17:27 +01:00
Derick Rethans a33d9d579e Empty merge 2015-06-15 10:17:26 +01:00
Derick Rethans 4903f1d139 - Updated to version .-96 () 2015-06-15 10:17:24 +01:00
Derick Rethans 3f93e4485e Empty merge 2015-06-15 10:17:24 +01:00
Derick Rethans 1d6f4891bd - Updated to version .-96 () 2015-06-15 10:17:23 +01:00
Aaron Piotrowski 103bf7eda0 Add Throwable tests 2015-06-15 01:47:34 -05:00
Aaron Piotrowski 8e7e4fb608 Fix previous exception type check 2015-06-15 01:36:49 -05:00
Xinchen Hui 8a324dae81 Merge branch 'master' of git.php.net:php-src 2015-06-15 13:37:14 +08:00
Xinchen Hui 55b7aa75aa Merge branch 'oci8-php7' of https://github.com/camporter/php-src 2015-06-15 13:35:26 +08:00
Aaron Piotrowski 5ed1b8443d Updated UPGRADING with RFC link 2015-06-15 00:00:19 -05:00
Aaron Piotrowski 482985ca38 Changed AssertionException to AssertionError 2015-06-14 23:52:39 -05:00
Aaron Piotrowski 4d590ac35a Update exception error messages 2015-06-14 22:43:11 -05:00
Aaron Piotrowski 110e0a5a2c Merge branch 'master' into throwable-interface
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
vlakoff 6cb7b48846 Fix typo in PHP 7 upgrade notes 2015-06-14 18:35:16 +02:00
Bob Weinand 37c91b8d03 Fix off by one in short_circuiting optimization 2015-06-14 17:47:35 +02:00
Xinchen Hui b7e477a8f9 Fixed bug #69831 (Segmentation fault in curl_getinfo) 2015-06-14 23:10:21 +08:00
Xinchen Hui f1ae57f155 Simplify the condition 2015-06-14 22:56:06 +08:00
Bob Weinand 7221bd682f Revert "Revert "Expand optimizations regarding short-circuting a bit""
This reverts commit 3770a5ac66.
Fixes the bug which probably made make install fail on travis
(It never happened to me that all tests passed, but make install failed...)
2015-06-14 15:46:11 +02:00
Anatol Belski a0556ea64a update UPGRADING 2015-06-14 13:45:40 +02:00
Anatol Belski 241bba9dd9 update UPGRADING 2015-06-14 12:54:19 +02:00
Xinchen Hui 3770a5ac66 Revert "Expand optimizations regarding short-circuting a bit"
This break the CI  (build error)

This reverts commit 3cfa58367b.
2015-06-14 14:27:48 +08:00
Xinchen Hui c196e86520 Fixed skipf 2015-06-14 13:44:39 +08:00
Xinchen Hui dc37d3e8c2 Fixed Bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33 extensions are loaded) 2015-06-14 12:28:40 +08:00
Bob Weinand 3cfa58367b Expand optimizations regarding short-circuting a bit 2015-06-14 06:01:01 +02:00
Bob Weinand b97944c6d1 Add ZEND_ASSERT_CHECK to phpdbg opcode jump list 2015-06-14 04:45:56 +02:00
Bob Weinand f263932f38 Fix short-circuting (bug #69825) 2015-06-14 02:00:55 +02:00
Anatol Belski 6084844fb5 Fix bug #69814 Enabling php_curl, php_mysqli, and php_openssl causes php-cgi to crash 2015-06-13 18:45:27 +02:00
Christoph M. Becker 336cfac7f3 ext/mysql has been removed as of PHP 7.0.0
So remove all related settings from php.ini-*, and add a respective entry in
UPGRADING (strangly, this part of fd1578c has been lost).
2015-06-13 16:44:52 +02:00
Matteo Beccati 1f9df49139 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix copy/paste error in test
2015-06-13 08:08:30 +02:00
Matteo Beccati b564aa95be Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix copy/paste error in test
2015-06-13 08:08:21 +02:00
Matteo Beccati 9e4d720825 Fix copy/paste error in test 2015-06-13 08:07:49 +02:00
Xinchen Hui 25cd356ed8 Revert "We are allowed to break ABI now..."
This reverts commit 30a8000ca1.
2015-06-13 11:05:05 +08:00
Xinchen Hui 30a8000ca1 We are allowed to break ABI now... 2015-06-13 11:03:50 +08:00
Xinchen Hui 20d85e4f02 typo 2015-06-13 10:56:30 +08:00
Xinchen Hui 829c7a1bb0 Merge branch 'master' of git.php.net:php-src 2015-06-13 10:51:15 +08:00
Xinchen Hui d96dda8d49 Fixed Bug #69761 (Serialization of anonymous classes should be prevented)
And also cleanup anonymous class compiling, it make no sense prefix a
namespace to anonymous class name. and it is always lowcased and
interned string.
2015-06-13 10:49:20 +08:00
Anatol Belski b148c50f48 Revert fix for bug #55407
See 8e19705a93 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
2015-06-12 17:56:02 +02:00
Bob Weinand 7c2a0157c7 Cache the class_name typehint key in arg_info
This leads to up to 2% improvement on one tested real world application by not having to always recalculate the lowercased string and its hash
2015-06-12 17:26:53 +02:00
Anthony Ferrara c8723564d4 Add line about scalar type declarations to UPGRADING 2015-06-12 10:05:07 -04:00
Xinchen Hui 49a8f801c7 Fixed bug #69805 (null ptr deref and seg fault in zend_resolve_class_name) 2015-06-12 21:07:23 +08:00
Dmitry Stogov 1c754f0b71 Get rid of more ZVAL_ZVAL() macros 2015-06-12 13:33:14 +03:00
Dmitry Stogov 8e10e8f921 Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
2015-06-12 12:33:23 +03:00
Stanislav Malyshev 7f4e1a0eef 5.4.43 next 2015-06-11 20:46:47 -07:00
Matteo Beccati 730d7b8fca Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_statement.c
2015-06-12 02:08:30 +02:00
Matteo Beccati 3bb1a4ffe3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
2015-06-12 02:07:02 +02:00
Matteo Beccati b60efdce9f Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) 2015-06-12 02:05:28 +02:00
Matteo Beccati cd5b7e9688 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
	win32/install.txt
2015-06-12 00:27:31 +02:00
Matteo Beccati afa4c3e7c7 Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:21:48 +02:00
Matteo Beccati 7c0b8f872e Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:20:33 +02:00
Christoph M. Becker 9692e74b04 Merge branch 'master' of https://git.php.net/push/php-src 2015-06-11 23:58:34 +02:00
Christoph M. Becker 8de667b8d2 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2015-06-11 23:55:10 +02:00
Nikita Popov 5d3cf577aa Make convert_to_* safe with rc>1
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.

All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).

What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.

Also fixes bug #69788.
2015-06-11 23:23:57 +02:00
Christoph M. Becker 163f51a4cf Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:54:47 +02:00
Christoph M. Becker d8223c4424 Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:52:30 +02:00
Christoph M. Becker 44b09b80f2 Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:44:14 +02:00
Nikita Popov 25098f0f5c Merge branch 'PHP-5.6' 2015-06-11 22:20:12 +02:00
Nikita Popov 1acf55eb75 Fixed bug #69803 2015-06-11 22:20:05 +02:00
Ferenc Kovacs e3ed32d315 Merge branch 'PHP-5.6'
* PHP-5.6:
  this is in 5.6.10, not in 5.6.9
2015-06-11 20:31:22 +02:00
Ferenc Kovacs 3f471c1c69 this is in 5.6.10, not in 5.6.9 2015-06-11 20:30:56 +02:00
Nikita Popov 580eb56fb7 Merge branch 'PHP-5.6'
Conflicts:
	Zend/zend_generators.c
2015-06-11 17:44:51 +02:00
Nikita Popov 8405265578 Fix bug #69740 2015-06-11 17:40:10 +02:00
Anatol Belski 8cfe28259e Merge branch 'PHP-5.6'
* PHP-5.6:
  rework that test to allow delta for rounding errors
2015-06-11 17:07:24 +02:00
Anatol Belski 702e349df4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  rework that test to allow delta for rounding errors
2015-06-11 17:06:46 +02:00
Anatol Belski a037b6de21 rework that test to allow delta for rounding errors
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
2015-06-11 17:05:03 +02:00
Anatol Belski 227680d6da Merge branch 'PHP-5.6'
* PHP-5.6:
  improve test
2015-06-11 15:37:06 +02:00
Anatol Belski d777669679 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improve test
2015-06-11 15:36:30 +02:00
Anatol Belski dcfd1153ec improve test 2015-06-11 15:36:02 +02:00
Anatol Belski 0228ccf246 Merge branch 'PHP-5.6'
* PHP-5.6:
  added test for bug #69646
2015-06-11 12:08:09 +02:00
Anatol Belski b19790ab34 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added test for bug #69646
2015-06-11 12:07:32 +02:00
Anatol Belski e711325ca6 added test for bug #69646 2015-06-11 12:06:59 +02:00
Stanislav Malyshev f69e5d3b19 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix bad copypaste
2015-06-11 01:52:39 -07:00
Stanislav Malyshev 9d162550ac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bad copypaste
2015-06-11 01:52:23 -07:00
Stanislav Malyshev cd927cca50 fix bad copypaste 2015-06-11 01:51:55 -07:00
Xinchen Hui 141f0ca18c Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables 2015-06-11 13:35:43 +08:00
Xinchen Hui 7f60923199 Fixed internal class flag restore 2015-06-11 12:53:56 +08:00
Dmitry Stogov be988aba36 Compile-time constant folding 2015-06-11 01:57:37 +03:00
Ferenc Kovacs 21719c760b Merge branch 'PHP-5.6'
* PHP-5.6:
  make it possible to set the re2c and yacc paths via environment variables for genfiles
2015-06-11 00:14:39 +02:00
Ferenc Kovacs f4d820f2ee Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  make it possible to set the re2c and yacc paths via environment variables for genfiles
2015-06-11 00:13:40 +02:00
Ferenc Kovacs 72b8a30c1a make it possible to set the re2c and yacc paths via environment variables for genfiles 2015-06-11 00:13:08 +02:00
Márcio Almada fdda34e0bc fix bad formatted "undefined offset" notice when key is negative 2015-06-10 22:18:23 +02:00
Dmitry Stogov 51dbf73954 Fetch operands of opceodes for binary operators in certain order (from left to right). 2015-06-10 22:25:24 +03:00
Anatol Belski 8ad5111d1c Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
2015-06-10 16:43:33 +02:00
Anatol Belski 45521b08b8 updated NEWS 2015-06-10 16:42:52 +02:00
Anatol Belski 2b0a19f4ed updated NEWS 2015-06-10 16:41:33 +02:00
Anatol Belski effbc87ff1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fix memory leak in pdo_pgsql closeCursor (bug 69752)
2015-06-10 16:41:07 +02:00
Anatol Belski 9d5ab7e22f updated NEWS 2015-06-10 16:40:38 +02:00
Philip Hofstetter 9ba3a4c66a fix memory leak in pdo_pgsql closeCursor (bug 69752)
the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.

This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.
2015-06-10 16:36:00 +02:00
Anatol Belski 9ec3bb8a98 Merge branch 'PHP-5.6'
* PHP-5.6:
  regenerated the ini scanner
2015-06-10 13:17:10 +02:00
Anatol Belski b1f3403c98 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  regenerated the ini scanner
2015-06-10 13:16:29 +02:00
Anatol Belski f14141aca2 regenerated the ini scanner
follow up fix for bug #69551
2015-06-10 13:15:01 +02:00
Anatol Belski 56ad2fcf20 updated NEWS 2015-06-10 11:27:24 +02:00
Anatol Belski 23e8956386 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:26:49 +02:00
Anatol Belski 2c55ae5261 updated NEWS 2015-06-10 11:26:00 +02:00
Anatol Belski 64df05d5b1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
2015-06-10 11:25:21 +02:00
Anatol Belski 60e181c20a updated NEWS 2015-06-10 11:24:45 +02:00
Christian Wenz 0c8136654d Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business" 2015-06-10 11:22:30 +02:00
Christian Wenz 82e5260104 Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
This reverts commit 4a05c81b85336b76d05017cc86372fbd04871e3f.
2015-06-10 11:22:29 +02:00
Christian Wenz 741b949a6f Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business" 2015-06-10 11:22:28 +02:00
Anatol Belski dbef99ba6e updated NEWS 2015-06-10 10:47:06 +02:00
Anatol Belski a96345d12b Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test
2015-06-10 10:44:44 +02:00
Anatol Belski f4707ed256 updated NEWS 2015-06-10 10:44:02 +02:00
Anatol Belski ca467d5117 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
  made failing test more meaningful
  added failing test
2015-06-10 10:43:23 +02:00
Anatol Belski aef5a02ebb updated NEWS 2015-06-10 10:42:31 +02:00
Christoph M. Becker 36222eb4cc fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault 2015-06-10 10:39:37 +02:00
Christoph M. Becker 2ba9681e8e made failing test more meaningful 2015-06-10 10:39:36 +02:00
Christoph M. Becker 616b932ab0 added failing test 2015-06-10 10:39:35 +02:00
Cameron Porter 3cf0bea098 Get oci8 extension compiling with php7. 2015-06-06 13:05:19 -05:00
Gunter Grodotzki 5f80da29ee fix typo, see #68476 2015-06-04 18:27:08 +02:00
Aaron Piotrowski 5c54bf015d Throwable method signatures. 2015-05-18 14:29:51 -05:00
Aaron Piotrowski 99640cd013 Merge branch 'master' into throwable-interface 2015-05-18 13:34:46 -05:00
Aaron Piotrowski e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Aaron Piotrowski 7e18df82a3 Merge exception formatting changes. 2015-05-17 17:31:06 -05:00
Aaron Piotrowski fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -05:00
Aaron Piotrowski 0eba6f597a Merge branch 'master' into throwable-interface 2015-05-17 12:12:02 -05:00
Aaron Piotrowski 26b35cab46 Make zend_get_exception_base static.
Soap extension can use other API functions.
2015-05-17 11:52:41 -05:00
Aaron Piotrowski 434a46612e Fix a few missed tests. 2015-05-16 22:04:16 -05:00
Aaron Piotrowski b965bab9f1 Fix handler double copy. 2015-05-16 19:48:59 -05:00
Aaron Piotrowski 64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00
Aaron Piotrowski d042d08807 Remodel exceptions based on Throwable interface
Added Throwable interface that exceptions must
implement in order to be thrown. BaseException
was removed, EngineException renamed to
Error, and TypeException and ParseException
renamed to TypeError and ParseError. Exception
and Error no longer extend a common base
class, rather they both implement the Throwable
interface.
2015-05-16 15:30:59 -05: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
K b3962ab940 zend_hash_do_resize: amortizing the cost of compaction
New implementation of hashtables introduced a compaction step which is
triggered when a hashtable is full but it contains at least one deleted
bucket. Therefore there is a possibility that a cleverly crafted code can
trigger this compaction step (which takes time proportional to the size of
hashtabe) by executing constatnt number of operations. When the hashtable
is full, deletion and subsequent addition or single element triggers a
table compaction and these two steps can be repeated ad infinitum. This
might be avenue for a DOS attack.

This patch allows compaction to be performed only if the hashtable contains
at least 1/32 deleted elements, otherwise the hashtable is doubled in size.
Linear amount of work caused by compaction is amortized over multiple
malicious additions and deletions.
2015-03-26 19:05:38 +01:00
1735 changed files with 84361 additions and 155124 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->ht 1
____print_ht $zvalue->value.arr 1
set $ind = $ind - 1
set $i = $ind
while $i > 0
+4 -2
View File
@@ -21,6 +21,9 @@
*.tar.gz
*.tar.bz2
*.tar.xz
*.tar.gz.asc
*.tar.bz2.asc
*.tar.xz.asc
.FBCIndex
.FBCLockFolder
.deps
@@ -188,6 +191,7 @@ ext/iconv/php_have_glibc_iconv.h
ext/iconv/php_php_iconv_impl.h
ext/iconv/php_have_iconv.h
ext/iconv/php_iconv_supports_errno.h
ext/iconv/php_iconv_broken_ignore.h
ext/mbstring/libmbfl/Makefile.in
ext/mbstring/libmbfl/autoscan.log
ext/mbstring/libmbfl/config.sub
@@ -284,5 +288,3 @@ win32/*.positions
win32/ext
win32/phpts.def
win32/wsyslog.h
win32/win32.dsp
win32/php.dsw
+3 -6
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
@@ -49,5 +47,4 @@ before_script:
# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -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
- ./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
+4 -82
View File
@@ -26,34 +26,12 @@ Status legend
== Server APIs ==
-------------------------------------------------------------------------------
EXTENSION: aolserver
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: apache
PRIMARY MAINTAINER: Rasmus Lerdorf <rasmus@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: apache_hooks
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: apache2filter
PRIMARY MAINTAINER: Aaron Bannert <aaron@php.net>
MAINTENANCE: Maintained
STATUS: Experimental
-------------------------------------------------------------------------------
EXTENSION: apache2handler
PRIMARY MAINTAINER: Aaron Bannert <aaron@php.net>, Ilia Alshanetsky <iliaa@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: caudium
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: cgi
MAINTENANCE: Unknown
STATUS: Working
@@ -63,11 +41,6 @@ MAINTENANCE: Marcus Boerger <helly@php.net>, Edin Kadribasic <edink@php.
STATUS: Working
SINCE: 4.3.0
-------------------------------------------------------------------------------
EXTENSION: continuity
PRIMARY MAINTAINER: Alex Leigh <aleigh@php.net>
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: embed
PRIMARY MAINTAINER: Edin Kadribasic <edink@php.net>
MAINTENANCE: Maintained
@@ -79,50 +52,15 @@ MAINTENANCE: Maintained
STATUS: Working
SINCE: 5.3.3
-------------------------------------------------------------------------------
EXTENSION: isapi
MAINTENANCE: Unknown
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: litespeed
PRIMARY MAINTAINER: George Wang <gwang@php.net>
MAINTENANCE: Maintained
STATUS: Working
SINCE: 5.3
-------------------------------------------------------------------------------
EXTENSION: milter
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: nsapi
PRIMARY MAINTAINER: Uwe Schindler <thetaphi@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: phttpd
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: pi3web
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: roxen
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: thttpd
PRIMARY MAINTAINER: Sascha Schumann <sascha@schumann.cx>
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: tux
MAINTENANCE: Unknown
STATUS: Unknown
-------------------------------------------------------------------------------
EXTENSION: webjames
PRIMARY MAINTAINER: Alex Waugh <alex@alexwaugh.com>
MAINTENANCE: Maintained
STATUS: Experimental
EXTENSION: phpdbg
MAINTENANCE: Joe Watkins <krakjoe@php.net>, Bob Weinand <bwoebi@php.net>
STATUS: 5.6
-------------------------------------------------------------------------------
@@ -140,17 +78,6 @@ PRIMARY MAINTAINER: Ard Biesheuvel <ard@ard.nu>
MAINTENANCE: Odd fixes
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mssql
PRIMARY MAINTAINER: Frank M. Kromann <fmk@swwwing.com>
MAINTENANCE: Maintained
STATUS: Working
COMMENT: Tested on phpts and isapi versions
-------------------------------------------------------------------------------
EXTENSION: mysql
PRIMARY MAINTAINER: Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: mysqli
PRIMARY MAINTAINER: Georg Richter <georg@php.net>, Andrey Hristov <andrey@php.net>, Johannes Schlüter <johannes@php.net>, Ulf Wendel <uw@php.net>
MAINTENANCE: Maintained
@@ -235,11 +162,6 @@ STATUS: Working
SINCE: 5.3
COMMENT: Integrates SQLite 3 embeddable SQL database engine.
-------------------------------------------------------------------------------
EXTENSION: sybase_ct
PRIMARY MAINTAINER: Timm Friebe <thekid@thekid.de>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
== XML extensions ==
@@ -407,7 +329,7 @@ STATUS: Working
SINCE: 5.2
-------------------------------------------------------------------------------
EXTENSION: ldap
PRIMARY MAINTAINER: Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>
PRIMARY MAINTAINER: Stig Venaas <venaas@php.net>, Douglas Goldstein <cardoe@php.net>, Pierre-Alain Joye <pajoye@php.net>, Côme Bernigaud <mcmic@php.net>
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
+11250 -16
View File
File diff suppressed because it is too large. Load diff
+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.
+3 -1
View File
@@ -266,7 +266,9 @@ to upgrade.
8. Commit all the changes to their respective git repos
9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
9. Please note down the sha256 and the PGP signature (.asc). These *must* be
included in the release mail.
10. Wait an hour or two, then send a mail to php-announce@lists.php.net,
php-general@lists.php.net and internals@lists.php.net with a text similar to
http://news.php.net/php.internals/17222.
Please make sure that the mail to php-announce@ is its own completely seperate email.
+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
+17 -3
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
@@ -437,6 +437,7 @@ static shm_pair *shm_get(int key, void *addr)
TWG(shm) = newptr;
ptr = newptr + TWG(shm_size);
TWG(shm_size)++;
memset(ptr, 0, sizeof(*ptr));
return ptr;
}
@@ -598,8 +599,10 @@ TSRM_API int shmget(int key, int size, int flags)
return -1;
}
sprintf(shm_segment, "TSRM_SHM_SEGMENT:%d", key);
sprintf(shm_info, "TSRM_SHM_DESCRIPTOR:%d", key);
snprintf(shm_segment, sizeof(shm_segment)-1, "TSRM_SHM_SEGMENT:%d", key);
snprintf(shm_info, sizeof(shm_info)-1, "TSRM_SHM_DESCRIPTOR:%d", key);
shm_segment[sizeof(shm_segment)-1] = '\0';
shm_info[sizeof(shm_info)-1] = '\0';
shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
@@ -611,6 +614,12 @@ TSRM_API int shmget(int key, int size, int flags)
created = TRUE;
}
if (!shm_handle || !info_handle) {
if (shm_handle) {
CloseHandle(shm_handle);
}
if (info_handle) {
CloseHandle(info_handle);
}
return -1;
}
} else {
@@ -620,6 +629,11 @@ TSRM_API int shmget(int key, int size, int flags)
}
shm = shm_get(key, NULL);
if (!shm) {
CloseHandle(shm_handle);
CloseHandle(info_handle);
return -1;
}
shm->segment = shm_handle;
shm->info = info_handle;
shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
+121 -33
View File
@@ -1,6 +1,4 @@
$Id$
PHP X.Y UPGRADE NOTES
PHP 7.0 UPGRADE NOTES
1. Backward Incompatible Changes
2. New Features
@@ -61,7 +59,7 @@ Changes to variable handling
$last = array_pop((getArray()));
// Strict Standards: Only variables should be passed by reference
will now throw a strict standards error irregardless of whether parentheses
will now throw a strict standards error regardless of whether parentheses
are used. Previously no notice was generated in the second case.
* Array elements or object properties that are automatically created during
@@ -255,10 +253,10 @@ Changes to integer handling
ignored. As such $i previously held the value 7, because the last two digits
were silently discarded.
* Bitwise shifts by negative numbers will now throw a warning and return false:
* Bitwise shifts by negative numbers will now throw an ArithmeticError:
var_dump(1 >> -1); // bool(false)
// Warning: Bit shift by negative number
var_dump(1 >> -1);
// ArithmeticError: Bit shift by negative number
* Left bitwise shifts by a number of bits beyond the bit width of an integer
will always result in 0:
@@ -299,7 +297,7 @@ Changes to string handling
if (false === $int) {
throw new Exception("Invalid integer!");
}
var_dump($num); // int(65535)
var_dump($int); // int(65535)
* Due to the addition of the Unicode Codepoint Escape Syntax for double-quoted
strings and heredocs, "\u{" followed by an invalid sequence will now result in
@@ -323,21 +321,21 @@ Relevant RFCs:
Changes to error handling
-------------------------
* The new base class of the exception hierarchy is BaseException, from which
Exception extends. Typehints in exception handling code may need to be changed
to account for this.
* There are now two exception classes: Exception and Error. Both classes
implement a new interface Throwable. Type hints in exception handling code
may need to be changed to account for this.
* Some fatal errors and recoverable fatal errors now throw an EngineException
instead. As EngineException extends BaseException but not Exception, these
exceptions will not caught by existing try/catch blocks.
* Some fatal errors and recoverable fatal errors now throw an Error instead.
As Error is a separate class from Exception, these exceptions will not be
caught by existing try/catch blocks.
For the recoverable fatal errors which have been converted into an exception,
it is no longer possible to silently ignore the error from an error handler.
In particular, it is no longer possible to ignore typehint failures.
In particular, it is no longer possible to ignore type hint failures.
* Parser errors now generate a ParseException (extends BaseException). Error
* Parser errors now generate a ParseError that extends Error. Error
handling for eval()s on potentially invalid code should be changed to catch
ParseException in addition to the previous return value / error_get_last()
ParseError in addition to the previous return value / error_get_last()
based handling.
* Constructors of internal classes will now always throw an exception on
@@ -347,13 +345,14 @@ Changes to error handling
Relevant RFCs:
* https://wiki.php.net/rfc/engine_exceptions_for_php7
* https://wiki.php.net/rfc/throwable-interface
* https://wiki.php.net/rfc/internal_constructor_behaviour
* https://wiki.php.net/rfc/reclassify_e_strict
Other language changes
----------------------
* Removed support for static calls to non-static calls form an incompatible
* Removed support for static calls to non-static methods from an incompatible
$this context. In this case $this will not be defined, but the call will be
allowed with a deprecation notice. An example:
@@ -428,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.
@@ -484,6 +483,10 @@ Other
. session.lazy_write(default=On) INI setting enables only write session data when
session data is updated.
- Opcache
. Removed opcache.load_comments configuration directive. Now doc comments
loading costs nothing and always enabled.
- OpenSSL:
. Removed the "rsa_key_size" SSL context option in favor of automatically
setting the appropriate size given the negotiated crypto algorithm.
@@ -492,7 +495,7 @@ Other
- PCRE:
. Removed support for /e (PREG_REPLACE_EVAL) modifier. Use
preg_reaplace_callback() instead.
preg_replace_callback() instead.
- PDO_pgsql:
. Removed PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT attribute in favor of
@@ -529,13 +532,34 @@ Other
. Closure::call() method added (works only with userland classes).
. Added \u{xxxxxx} Unicode Codepoint Escape Syntax for double-quoted strings
and heredocs.
. define() now supports arrays as constant values, fixing an oversight where define() did not support arrays yet const syntax did.
. define() now supports arrays as constant values, fixing an oversight where
define() did not support arrays yet const syntax did.
. Added the comparison operator (<=>), aka the spaceship operator.
(RFC: https://wiki.php.net/rfc/combined-comparison-operator)
. Added the yield from operator for delegating Generators like coroutines.
(RFC: https://wiki.php.net/rfc/generator-delegation)
. Reserved keywords can now be used in various new contexts.
(RFC: https://wiki.php.net/rfc/context_sensitive_lexer)
. Added support for scalar type declarations and strict mode using
declare(strict_types=1) (RFC: https://wiki.php.net/rfc/scalar_type_hints_v5)
. Added support for cryptographically secure user land RNG
(RFC: https://wiki.php.net/rfc/easy_userland_csprng)
- Opcache
. Added second level file based opcode cache. It may be enabled by setting
opcache.file_cache=<DIR> configuration directive in php.ini. The second
level cache may improve performance when SHM is full, at server restart or
SHM reset. In addition, it's possibe to use file cache without SHM at all,
using opcache.file_cache_only=1 (this may be useful for sharing hosting),
and disable file cache consistency check, to speedup loading at the cost of
safety, using opcache.file_cache_consistency_checks=0.
. Added ability to move PHP code pages (PHP TEXT segment) into HUGE pages.
It's possible to enable/disable this feature in php.ini through
opcache.huge_code_pages=0/1. OS should be configured to provide huge pages.
. Added Windows only opcache.file_cache_fallback=1 ini option, which implies
the implemented fallback mechanism. When OPcache was not able to reattach
the shared memory segment to the desired address and opcache.file_cache
is on, opcache.file_cache_only=1 will be automatically enforced.
- OpenSSL
. Added "alpn_protocols" SSL context option allowing encrypted client/server
@@ -551,6 +575,13 @@ Other
and ReflectionFunctionAbstract::getReturnType() methods both return an
instance of ReflectionType.
- Stream:
. New Windows only stream context options was added to allow blocking reads
on pipes. To enable it, pass array("pipe" => array("blocking" => true))
when creating the stream context. Be aware, that this option can under
circumstances cause dead locks on the pipe buffer. However it can be useful
in several CLI use case scenarios.
========================================
3. Changes in SAPI modules
========================================
@@ -577,23 +608,43 @@ Other
5. Changed Functions
========================================
- parse_ini_file():
- parse_ini_string():
. Added scanner mode INI_SCANNER_TYPED to yield typed .ini values.
- unserialize():
. Added second parameter for unserialize function
(RFC: https://wiki.php.net/rfc/secure_unserialize) allowing to specify
acceptable classes:
unserialize($foo, ["allowed_classes" => ["MyClass", "MyClass2"]);
unserialize($foo, ["allowed_classes" => ["MyClass", "MyClass2"]]);
- proc_open():
The maximum number of pipes used by proc_open() was previously limited by
. The maximum number of pipes used by proc_open() was previously limited by
hardcoded value of 16. This limit is now removed and the number of pipes is
effectively limited by the amount of memory available to PHP.
. New Windows only configuration option "blocking_pipes" can be used to
force blocking reads on child process pipes. This covers several
edge cases in CLI usage however can lead to dead locks. Also, this
correlates with the new stream context options for pipes.
- array_column():
The function now supports an array of objects as well as two-dimensional
arrays. Only public properties are considered, and objects that make use of
__get() for dynamic properties must also implement __isset().
- stream_context_create()
It accepts now a Windows only configuration
array("pipe" => array("blocking" => <boolean>)) which forces blocking reads
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
========================================
- GMP
. Added gmp_random_seed().
@@ -605,6 +656,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.
@@ -613,6 +668,8 @@ Other
7. New Classes and Interfaces
========================================
- ReflectionGenerator
- ReflectionType
========================================
8. Removed Extensions and SAPIs
@@ -634,16 +691,31 @@ Other
- sapi/tux
- sapi/webjames
- ext/mssql
- ext/mysql
- ext/sybase_ct
For more details see https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
- ext/ereg
NOTE NSAPI was not voted in the RFC, however it was removed afterwards. It turned
For more details see
https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7
NOTE: NSAPI was not voted in the RFC, however it was removed afterwards. It turned
out, that the corresponding SDK isn't available anymore.
========================================
9. Other Changes to Extensions
========================================
- Mhash
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.
- Openssl
minimum supported OpenSSL version series was raised to 0.9.8
========================================
10. New Global Constants
@@ -652,6 +724,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:
@@ -703,6 +780,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
@@ -712,10 +792,18 @@ out, that the corresponding SDK isn't available anymore.
- Core
. Instead of being undefined and platform-dependent, NaN and Infinity will
always be zero when casted to integer.
. Calling a method on a non-object no longer raises a fatal error; see
also: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object.
always be zero when cast to integer.
. Calling a method on a non-object now raises a catchable error instead of a
fatal error; see: https://wiki.php.net/rfc/catchable-call-to-member-of-non-object
. Error messages for zend_parse_parameters, type hints and conversions now
always say "integer" and "float" instead of "long" and "double".
. Output buffering now continues to work for an aborted connection if
ignore_user_abort is set to true.
. Zend Extensions API was extended with zend_extension.op_array_persist_calc()
and zend_extensions.op_array_persist() handlers. They allow to store (or
reset) associated with op_array addition information in Opcache Shared
Memory.
. zend_internal_function.reserved[] array was introduced to allow association
of aditional information with internal functions. In PHP-5 it was possible
to use zend_function.op_array.reserved[] even for internal functions, but
now we don't allocate extra space.
+58 -3
View File
@@ -1,5 +1,3 @@
$Id$
PHP 7.0 INTERNALS UPGRADE NOTES
0. Wiki Examples
@@ -18,11 +16,16 @@ PHP 7.0 INTERNALS UPGRADE NOTES
p. TSRM changes
q. gc_collect_cycles() is now hookable
r. PDO uses size_t for lengths
s. Resource API changes
t. Optimized strings concatenation.
u. Streams changes
v. Sort algorithm changes
2. Build system changes
a. Unix build system changes
b. Windows build system changes
3. Module changes
================
0. Wiki Examples
@@ -79,7 +82,7 @@ changes. See: https://wiki.php.net/phpng-upgrading
g. sprintf() formats
New printf modifier 'p' was implemented to platform independently output zend_long,
zend_ulong and php_size_t datatypes. That modifier can be used with'd', 'u', 'x' and 'o'
zend_ulong and php_size_t datatypes. That modifier can be used with 'd', 'u', 'x' and 'o'
printf format specs with spprintf, snprintf and the wrapping printf implementations.
%pu is sufficient for both zend_ulong and php_size_t. the code using %p spec to output
pointer address might need to be enclosed into #ifdef when it unlickily followed by 'd',
@@ -190,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
@@ -210,6 +236,21 @@ changes. See: https://wiki.php.net/phpng-upgrading
Instead of reallocation and copying string on each ZEND_ADD_STRING/VAR/CAHR,
collect all the strings and then allocate and construct the resulting string once.
u. Streams changes
- It is possible to do blocking reads on Windows pipes. It can be done either
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.
w. Tick functions internal API change
Tick functions have different declaration now. They expect a single
single parameter while before they were parameterless. When registering the
tick function a value for this parameter must be passed. This value will be
provided to the tick function on every execution.
========================
2. Build system changes
@@ -267,3 +308,17 @@ changes. See: https://wiki.php.net/phpng-upgrading
- More documentation can be found in ext/session/mod_files.c as comments.
mod_files.c may be used as reference implementation.
Openssl:
- several ext/openssl functions require the inclusion of the applink shim
as documented in the OpenSSL FAQ https://www.openssl.org/support/faq.html#PROG2
to properly work on Windows. While this primarily affects the OpenSSL
functionality, the shim needs to be included into the executable file
which loads the extension DLL, not into the extension DLL itself. Alternatively
it can be compiled and linked with the main program as a separate object file.
More information and explanation in the linked OpenSSL FAQ.
Thus, this primarily affects any WAMP or other redistributions bundling the
official PHP release zipballs or building from sources. The applink shim is
already integrated with all the PHP executables from the official distribution
starting with 7.0.0beta1.
+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
], [
+1 -1
View File
@@ -20,7 +20,7 @@ bool(true)
Notice: Undefined offset: 2 in %s on line %d
Fatal error: Uncaught EngineException: Function name must be a string in %s:%d
Fatal error: Uncaught Error: Function name must be a string in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+3 -3
View File
@@ -34,7 +34,7 @@ $test->bar();
object(Exception)#%d (7) {
["message":protected]=>
string(3) "foo"
["string":"BaseException":private]=>
["string":"Exception":private]=>
string(0) ""
["code":protected]=>
int(0)
@@ -42,7 +42,7 @@ object(Exception)#%d (7) {
string(%d) "%s030.php"
["line":protected]=>
int(%d)
["trace":"BaseException":private]=>
["trace":"Exception":private]=>
array(1) {
[0]=>
array(6) {
@@ -61,7 +61,7 @@ object(Exception)#%d (7) {
}
}
}
["previous":"BaseException":private]=>
["previous":"Exception":private]=>
NULL
}
'test' => '0'
+1 -1
View File
@@ -16,7 +16,7 @@ var_dump($x::$x);
--EXPECTF--
int(1)
Fatal error: Uncaught EngineException: Access to undeclared static property: Closure::$x in %s:%d
Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+1 -1
View File
@@ -28,7 +28,7 @@ new c;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Call to private method d::test2() from context 'a' in %s:%d
Fatal error: Uncaught Error: Call to private method d::test2() from context 'a' in %s:%d
Stack trace:
#0 %s(%d): a->test()
#1 %s(%d): c->__construct()
+2 -2
View File
@@ -10,7 +10,7 @@ $o->prop = "value";
try {
var_dump($a + $o);
} catch (EngineException $e) {
} catch (Error $e) {
echo "\nException: " . $e->getMessage() . "\n";
}
@@ -26,7 +26,7 @@ Exception: Unsupported operand types
Notice: Object of class stdClass could not be converted to int in %s on line %d
Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
Fatal error: Uncaught Error: Unsupported operand types in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+2 -2
View File
@@ -10,7 +10,7 @@ $o->prop = "value";
try {
var_dump($o + $a);
} catch (EngineException $e) {
} catch (Error $e) {
echo "\nException: " . $e->getMessage() . "\n";
}
@@ -26,7 +26,7 @@ Exception: Unsupported operand types
Notice: Object of class stdClass could not be converted to int in %s on line %d
Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
Fatal error: Uncaught Error: Unsupported operand types in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+2 -2
View File
@@ -7,7 +7,7 @@ $a = array(1,2,3);
try {
var_dump($a + 5);
} catch (EngineException $e) {
} catch (Error $e) {
echo "\nException: " . $e->getMessage() . "\n";
}
@@ -19,7 +19,7 @@ echo "Done\n";
--EXPECTF--
Exception: Unsupported operand types
Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
Fatal error: Uncaught Error: Unsupported operand types in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+2 -2
View File
@@ -9,7 +9,7 @@ $s1 = "some string";
try {
var_dump($a + $s1);
} catch (EngineException $e) {
} catch (Error $e) {
echo "\nException: " . $e->getMessage() . "\n";
}
@@ -21,7 +21,7 @@ echo "Done\n";
--EXPECTF--
Exception: Unsupported operand types
Fatal error: Uncaught EngineException: Unsupported operand types in %s:%d
Fatal error: Uncaught Error: Unsupported operand types in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+1 -1
View File
@@ -10,6 +10,6 @@ namespace {
var_dump ($hello);
}
--EXPECTF--
object(lone\class@%s)#1 (0) {
object(class@%s)#1 (0) {
}
+1 -1
View File
@@ -18,6 +18,6 @@ namespace lone {
new Outer();
}
--EXPECTF--
object(lone\class@%s)#2 (0) {
object(class@%s)#2 (0) {
}
+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
}
+2 -2
View File
@@ -9,12 +9,12 @@ set_error_handler(function($errno, $errstr) {
try {
var_dump(...[1, 2, "foo" => 3, 4]);
} catch (EngineException $ex) {
} catch (Error $ex) {
var_dump($ex->getMessage());
}
try {
var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
} catch (EngineException $ex) {
} catch (Error $ex) {
var_dump($ex->getMessage());
}
+1 -1
View File
@@ -13,4 +13,4 @@ class Sub extends Base {
}
?>
--EXPECTF--
Warning: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d
Warning: Declaration of & Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d
+1 -1
View File
@@ -13,4 +13,4 @@ class Sub extends Base {
}
?>
--EXPECTF--
Warning: Declaration of Sub::test() should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
Warning: Declaration of Sub::test($foo, array &$bar) should be compatible with Base::test($foo, array &$bar, $option = NULL, $extra = 3.1415926535898) in %sargument_restriction_002.php on line %d
+1 -1
View File
@@ -13,4 +13,4 @@ class Sub extends Base {
}
?>
--EXPECTF--
Warning: Declaration of Sub::test() should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
Warning: Declaration of Sub::test($foo, $extra) should be compatible with Base::test($foo, $extra = Array) in %sargument_restriction_006.php on line %d
+21
View File
@@ -0,0 +1,21 @@
--TEST--
Ensure "undefined offset" notice formats message corectly when undefined key is negative
--FILE--
<?php
[][-1];
[][-1.1];
(new ArrayObject)[-1];
(new ArrayObject)[-1.1];
echo "Done\n";
?>
--EXPECTF--
Notice: Undefined offset: -1 in %s on line 3
Notice: Undefined offset: -1 in %s on line 4
Notice: Undefined offset: -1 in %s on line 5
Notice: Undefined offset: -1 in %s on line 6
Done
+1 -1
View File
@@ -12,7 +12,7 @@ foo(123);
--EXPECTF--
3
Fatal error: Uncaught TypeException: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
Fatal error: Uncaught TypeError: Argument 1 passed to foo() must be of the type array, integer given, called in %sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php:2
Stack trace:
#0 %s(%d): foo(123)
#1 {main}
+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)
+23
View File
@@ -0,0 +1,23 @@
--TEST--
Bug #70528 (assert() with instanceof adds apostrophes around class name)
--INI--
zend.assertions=1
assert.exception=0
assert.warning=1
--FILE--
<?php
namespace Foo;
class Bar {}
$bar = "Bar";
assert(new \stdClass instanceof $bar);
assert(new \stdClass instanceof Bar);
assert(new \stdClass instanceof \Foo\Bar);
?>
--EXPECTF--
Warning: assert(): assert(new \stdClass() instanceof $bar) failed in %sbug70528.php on line %d
Warning: assert(): assert(new \stdClass() instanceof Bar) failed in %sbug70528.php on line %d
Warning: assert(): assert(new \stdClass() instanceof \Foo\Bar) failed in %sbug70528.php on line %d
+1 -1
View File
@@ -9,7 +9,7 @@ assert(false);
var_dump(true);
?>
--EXPECTF--
Fatal error: Uncaught AssertionException: assert(false) in %sexpect_002.php:%d
Fatal error: Uncaught AssertionError: assert(false) in %sexpect_002.php:%d
Stack trace:
#0 %sexpect_002.php(%d): assert(false, 'assert(false)')
#1 {main}
+1 -1
View File
@@ -7,7 +7,7 @@ assert.exception=1
<?php
try {
assert(false);
} catch (AssertionException $ex) {
} catch (AssertionError $ex) {
var_dump($ex->getMessage());
}
?>
+1 -1
View File
@@ -7,7 +7,7 @@ assert.exception=1
<?php
try {
assert(false, "I require this to succeed");
} catch (AssertionException $ex) {
} catch (AssertionError $ex) {
var_dump($ex->getMessage());
}
?>
+1 -1
View File
@@ -8,7 +8,7 @@ assert.exception=1
try {
/* by passing we test there are no leaks upon success */
assert(true, "I require this to succeed");
} catch (AssertionException $ex) {
} catch (AssertionError $ex) {
var_dump($ex->getMessage());
}
var_dump(true);
+3 -3
View File
@@ -11,12 +11,12 @@ $data = array(
"value" => "testing"
);
class HeaderMalfunctionException extends AssertionException {}
class HeaderMalfunctionError extends AssertionError {}
assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionException("malformed key found at {$next} \"{$data["key"]}\""));
assert (preg_match("~^([a-zA-Z0-9-]+)$~", $data["key"]), new HeaderMalfunctionError("malformed key found at {$next} \"{$data["key"]}\""));
?>
--EXPECTF--
Fatal error: Uncaught HeaderMalfunctionException: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10
Fatal error: Uncaught HeaderMalfunctionError: malformed key found at 1 "X-HTTP " in %sexpect_007.php:10
Stack trace:
#0 {main}
thrown in %sexpect_007.php on line 10
+1 -1
View File
@@ -12,7 +12,7 @@ class One {
}
class Two extends One {}
class OdEar extends AssertionException {}
class OdEar extends AssertionError {}
function blah(){ return 1; }
+1 -1
View File
@@ -17,7 +17,7 @@ class Two extends One {
new Two();
?>
--EXPECTF--
Fatal error: Uncaught AssertionException: assert(false) in %sexpect_009.php:%d
Fatal error: Uncaught AssertionError: assert(false) in %sexpect_009.php:%d
Stack trace:
#0 %sexpect_009.php(%d): assert(false, 'assert(false)')
#1 %sexpect_009.php(%d): Two->__construct()
+1 -1
View File
@@ -15,7 +15,7 @@ class Two extends One {}
new Two();
?>
--EXPECTF--
Fatal error: Uncaught AssertionException: assert(false) in %sexpect_010.php:%d
Fatal error: Uncaught AssertionError: assert(false) in %sexpect_010.php:%d
Stack trace:
#0 %sexpect_010.php(%d): assert(false, 'assert(false)')
#1 %sexpect_010.php(%d): One->__construct()
+2 -2
View File
@@ -5,7 +5,7 @@ zend.assertions=1
assert.exception=1
--FILE--
<?php
class MyExpectations extends AssertionException {
class MyExpectations extends AssertionError {
public function __toString() {
return sprintf(
"[Message]: %s", __CLASS__);
@@ -22,7 +22,7 @@ class Two extends One {}
new Two();
?>
--EXPECTF--
Fatal error: Uncaught AssertionException: [Message]: MyExpectations in %sexpect_011.php:%d
Fatal error: Uncaught AssertionError: [Message]: MyExpectations in %sexpect_011.php:%d
Stack trace:
#0 %sexpect_011.php(%d): assert(false, '[Message]: MyEx...')
#1 %sexpect_011.php(%d): One->__construct()
-6
View File
@@ -144,12 +144,6 @@ assert(0 && ($a = function () {
?>
--EXPECTF--
Warning: Unsupported declare 'A' in %sexpect_015.php on line %d
Warning: Unsupported declare 'B' in %sexpect_015.php on line %d
Warning: Unsupported declare 'C' in %sexpect_015.php on line %d
Warning: assert(): assert(0 && ($a = function () {
global $a;
global $$b;
@@ -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
+1 -1
View File
@@ -6,7 +6,7 @@ Bug #24773 (unset() of integers treated as arrays causes a crash)
unset($array["lvl1"]["lvl2"]["b"]);
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot use string offset as an array in %s:%d
Fatal error: Uncaught Error: Cannot use string offset as an array in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+6 -6
View File
@@ -37,25 +37,25 @@ function my_error_handler($errno, $errstr, $errfile, $errline) {
set_error_handler('my_error_handler');
class None
class NoneTest
{
function __toString() {
}
}
$o = new None;
$o = new NoneTest;
echo $o;
echo "===THROW===\n";
class Error
class ErrorTest
{
function __toString() {
throw new Exception("This is an error!");
}
}
$o = new Error;
$o = new ErrorTest;
try {
echo $o;
}
@@ -68,7 +68,7 @@ catch (Exception $e) {
--EXPECTF--
Hello World!
===NONE===
string(52) "Method None::__toString() must return a string value"
string(56) "Method NoneTest::__toString() must return a string value"
===THROW===
Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
Fatal error: Method ErrorTest::__toString() must not throw an exception in %sbug26166.php on line %d
+1 -1
View File
@@ -8,7 +8,7 @@ $a->$x = "string('')";
var_dump($a);
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot access empty property in %sbug29015.php:4
Fatal error: Uncaught Error: Cannot access empty property in %sbug29015.php:4
Stack trace:
#0 {main}
thrown in %sbug29015.php on line 4
+1 -1
View File
@@ -38,7 +38,7 @@ NULL
===CHILD===
string(4) "Base"
Fatal error: Uncaught EngineException: Cannot access private property ChildClass::$private_child in %sbug29674.php:%d
Fatal error: Uncaught Error: Cannot access private property ChildClass::$private_child in %sbug29674.php:%d
Stack trace:
#0 %s(%d): BaseClass->printVars()
#1 {main}
+1 -1
View File
@@ -45,7 +45,7 @@ __autoload(Test2,2)
Caught: __autoload
__autoload(Test3,3)
Fatal error: Uncaught EngineException: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1
Fatal error: Uncaught Error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1
Stack trace:
#0 %s(%d): eval()
#1 {main}
+1 -1
View File
@@ -36,7 +36,7 @@ A Object
Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23
Fatal error: Uncaught EngineException: Cannot assign by reference to overloaded object in %sbug32660.php:23
Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %sbug32660.php:23
Stack trace:
#0 {main}
thrown in %sbug32660.php on line 23
+1 -1
View File
@@ -5,7 +5,7 @@ Bug #33318 (throw 1; results in Invalid opcode 108/1/8)
throw 1;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Can only throw objects in %sbug33318.php:2
Fatal error: Uncaught Error: Can only throw objects in %sbug33318.php:2
Stack trace:
#0 {main}
thrown in %sbug33318.php on line 2
+1 -1
View File
@@ -26,7 +26,7 @@ FooTest(new Foo());
--EXPECTF--
Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line %d and defined in %sbug33996.php on line %d
Hi!
Fatal error: Uncaught TypeException: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php:%d
Fatal error: Uncaught TypeError: Argument 1 passed to FooTest() must be an instance of Foo, none given, called in %sbug33996.php on line %d and defined in %sbug33996.php:%d
Stack trace:
#0 %s(%d): FooTest()
#1 {main}
+1 -1
View File
@@ -31,7 +31,7 @@ array(1) {
string(2) "ok"
}
Fatal error: Uncaught EngineException: Cannot use [] for reading in %sbug34064.php:18
Fatal error: Uncaught Error: Cannot use [] for reading in %sbug34064.php:18
Stack trace:
#0 %s(%d): XmlTest->run()
#1 {main}
+1 -1
View File
@@ -8,7 +8,7 @@ $a = clone 0;
$a[0]->b = 0;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug36071.php:2
Fatal error: Uncaught Error: __clone method called on non-object in %sbug36071.php:2
Stack trace:
#0 {main}
thrown in %sbug36071.php on line 2
+1 -1
View File
@@ -11,7 +11,7 @@ $x = new Foo();
bar();
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Call to undefined function bar() in %sbug36268.php:8
Fatal error: Uncaught Error: Call to undefined function bar() in %sbug36268.php:8
Stack trace:
#0 {main}
thrown in %sbug36268.php on line 8
+1 -1
View File
@@ -10,7 +10,7 @@ class Foo {
try {
$foo = new Foo();
$foo->bar();
} catch (EngineException $e) {
} catch (Error $e) {
echo 'OK';
}
--EXPECT--
+1 -1
View File
@@ -132,7 +132,7 @@ B2::doTest
C2::test
B4::doTest
Fatal error: Uncaught EngineException: Call to protected C4::__construct() from context 'B4' in %sbug37632.php:%d
Fatal error: Uncaught Error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php:%d
Stack trace:
#0 %s(%d): B4::doTest()
#1 {main}
+1 -2
View File
@@ -20,10 +20,10 @@ class Loader {
return $this->position >= strlen($this->data);
}
function stream_flush() {
@unlink(dirname(__FILE__)."/bug38779.txt");
var_dump("flush!");
}
function stream_close() {
@unlink(dirname(__FILE__)."/bug38779.txt");
var_dump("close!");
}
}
@@ -49,5 +49,4 @@ if (file_exists($filename)) {
?>
--EXPECTF--
Parse error: %s error%sin %s on line %d
string(6) "flush!"
string(6) "close!"
+1 -1
View File
@@ -21,7 +21,7 @@ test($obj);
echo "Done\n";
?>
--EXPECTF--
Fatal error: Uncaught TypeException: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s:%d
Fatal error: Uncaught TypeError: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s:%d
Stack trace:
#0 %s(%d): test(Object(ClassName))
#1 {main}
+1 -1
View File
@@ -17,7 +17,7 @@ echo "Done\n";
--EXPECTF--
Deprecated: Non-static method Foo::get() should not be called statically in %s on line %d
Fatal error: Uncaught EngineException: Non-static method Foo::__construct() cannot be called statically in %s:%d
Fatal error: Uncaught Error: Non-static method Foo::__construct() cannot be called statically in %s:%d
Stack trace:
#0 %s(%d): Foo::get()
#1 {main}
+1 -1
View File
@@ -8,7 +8,7 @@ class Foo {
echo Foo::A."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined class constant 'self::B' in %sbug41633_2.php:5
Fatal error: Uncaught Error: Undefined class constant 'self::B' in %sbug41633_2.php:5
Stack trace:
#0 {main}
thrown in %sbug41633_2.php on line 5
+1 -1
View File
@@ -9,7 +9,7 @@ class Foo {
echo Foo::A;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot declare self-referencing constant 'Foo::B' in %sbug41633_3.php:%d
Fatal error: Uncaught Error: Cannot declare self-referencing constant 'Foo::B' in %sbug41633_3.php:%d
Stack trace:
#0 {main}
thrown in %sbug41633_3.php on line %d
+1 -1
View File
@@ -9,7 +9,7 @@ $foo[0]->bar = "xyz";
echo "Done\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot use string offset as an array in %s:%d
Fatal error: Uncaught Error: Cannot use string offset as an array in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+1 -1
View File
@@ -8,7 +8,7 @@ $foo[3]->bar[1] = "bang";
echo "ok\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot use string offset as an object in %sbug41919.php:%d
Fatal error: Uncaught Error: Cannot use string offset as an object in %sbug41919.php:%d
Stack trace:
#0 {main}
thrown in %sbug41919.php on line %d
+1 -1
View File
@@ -37,7 +37,7 @@ ok
ok
ok
Fatal error: Uncaught TypeException: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php:%d
Fatal error: Uncaught TypeError: Argument 1 passed to foo\test5() must be an instance of bar, instance of foo\bar given, called in %sbug42802.php on line %d and defined in %sbug42802.php:%d
Stack trace:
#0 %s(%d): foo\test5(Object(foo\bar))
#1 {main}
+1 -1
View File
@@ -6,7 +6,7 @@ $a = clone(null);
array_push($a->b, $c);
?>
--EXPECTF--
Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug42817.php:2
Fatal error: Uncaught Error: __clone method called on non-object in %sbug42817.php:2
Stack trace:
#0 {main}
thrown in %sbug42817.php on line 2
+1 -1
View File
@@ -5,7 +5,7 @@ Bug #42818 ($foo = clone(array()); leaks memory)
$foo = clone(array());
?>
--EXPECTF--
Fatal error: Uncaught EngineException: __clone method called on non-object in %sbug42818.php:2
Fatal error: Uncaught Error: __clone method called on non-object in %sbug42818.php:2
Stack trace:
#0 {main}
thrown in %sbug42818.php on line 2
+1 -1
View File
@@ -299,7 +299,7 @@ Array
[1] => 1
)
Fatal error: Uncaught EngineException: Undefined constant 'foo\foo\unknown' in %sbug42819.php:%d
Fatal error: Uncaught Error: Undefined constant 'foo\foo\unknown' in %sbug42819.php:%d
Stack trace:
#0 %s(%d): foo\oops()
#1 {main}
+1 -1
View File
@@ -39,7 +39,7 @@ test3
test4
test5
Fatal error: Uncaught EngineException: Call to undefined method C::test6() in %sbug42937.php:21
Fatal error: Uncaught Error: Call to undefined method C::test6() in %sbug42937.php:21
Stack trace:
#0 %s(%d): B->test()
#1 {main}
+1 -1
View File
@@ -12,7 +12,7 @@ $foo = new foo;
$foo->bar($foo); // Ok!
$foo->bar(new \stdclass); // Error, ok!
--EXPECTF--
Fatal error: Uncaught TypeException: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php:5
Fatal error: Uncaught TypeError: Argument 1 passed to foobar\foo::bar() must be an instance of foobar\foo, instance of stdClass given, called in %sbug43332_1.php on line 10 and defined in %sbug43332_1.php:5
Stack trace:
#0 %s(%d): foobar\foo->bar(Object(stdClass))
#1 {main}
+1 -1
View File
@@ -5,7 +5,7 @@ Bug #43344.10 (Wrong error message for undefined namespace constant)
echo namespace\bar."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_10.php:%d
Fatal error: Uncaught Error: Undefined constant 'bar' in %sbug43344_10.php:%d
Stack trace:
#0 {main}
thrown in %sbug43344_10.php on line %d
+1 -1
View File
@@ -8,7 +8,7 @@ function f($a=namespace\bar) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_11.php:%d
Fatal error: Uncaught Error: Undefined constant 'bar' in %sbug43344_11.php:%d
Stack trace:
#0 %s(%d): f()
#1 {main}
+1 -1
View File
@@ -8,7 +8,7 @@ function f($a=array(namespace\bar)) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_12.php:%d
Fatal error: Uncaught Error: Undefined constant 'bar' in %sbug43344_12.php:%d
Stack trace:
#0 %s(%d): f()
#1 {main}
+1 -1
View File
@@ -9,7 +9,7 @@ function f($a=array(namespace\bar=>0)) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'bar' in %sbug43344_13.php:%d
Fatal error: Uncaught Error: Undefined constant 'bar' in %sbug43344_13.php:%d
Stack trace:
#0 %s(%d): f()
#1 {main}
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Foo;
echo Foo::bar."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Class 'Foo\Foo' not found in %sbug43344_2.php:%d
Fatal error: Uncaught Error: Class 'Foo\Foo' not found in %sbug43344_2.php:%d
Stack trace:
#0 {main}
thrown in %sbug43344_2.php on line %d
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Foo;
echo namespace\bar."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_6.php:%d
Fatal error: Uncaught Error: Undefined constant 'Foo\bar' in %sbug43344_6.php:%d
Stack trace:
#0 {main}
thrown in %sbug43344_6.php on line %d
+1 -1
View File
@@ -9,7 +9,7 @@ function f($a=namespace\bar) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_7.php:%d
Fatal error: Uncaught Error: Undefined constant 'Foo\bar' in %sbug43344_7.php:%d
Stack trace:
#0 %s(%d): Foo\f()
#1 {main}
+1 -1
View File
@@ -9,7 +9,7 @@ function f($a=array(namespace\bar)) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_8.php:%d
Fatal error: Uncaught Error: Undefined constant 'Foo\bar' in %sbug43344_8.php:%d
Stack trace:
#0 %s(%d): Foo\f()
#1 {main}
+1 -1
View File
@@ -10,7 +10,7 @@ function f($a=array(namespace\bar=>0)) {
echo f()."\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Undefined constant 'Foo\bar' in %sbug43344_9.php:%d
Fatal error: Uncaught Error: Undefined constant 'Foo\bar' in %sbug43344_9.php:%d
Stack trace:
#0 %s(%d): Foo\f()
#1 {main}
+1 -1
View File
@@ -22,7 +22,7 @@ class Y extends X
$y = Y::cheat(5);
echo $y->x, PHP_EOL;
--EXPECTF--
Fatal error: Uncaught EngineException: Call to private X::__construct() from context 'Y' in %sbug44141.php:15
Fatal error: Uncaught Error: Call to private X::__construct() from context 'Y' in %sbug44141.php:15
Stack trace:
#0 %s(%d): Y::cheat(5)
#1 {main}
+1 -1
View File
@@ -62,7 +62,7 @@ value6
value6
value6
Fatal error: Uncaught EngineException: Undefined constant 'NS1\ns2\coNSt1' in %sbug46304.php:%d
Fatal error: Uncaught Error: Undefined constant 'NS1\ns2\coNSt1' in %sbug46304.php:%d
Stack trace:
#0 {main}
thrown in %sbug46304.php on line %d
+1 -1
View File
@@ -14,7 +14,7 @@ $test->method();
echo "Done\n";
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Non-static method ArrayIterator::current() cannot be called statically in %s:%d
Fatal error: Uncaught Error: Non-static method ArrayIterator::current() cannot be called statically in %s:%d
Stack trace:
#0 %s(%d): test->method()
#1 {main}
+1 -1
View File
@@ -36,7 +36,7 @@ Warning: get_called_class() called from outside a class in %s on line %d
Deprecated: Non-static method D::m() should not be called statically in %s on line %d
Fatal error: Uncaught EngineException: Using $this when not in object context in %s:%d
Fatal error: Uncaught Error: Using $this when not in object context in %s:%d
Stack trace:
#0 %s(%d): D::m()
#1 {main}
+1 -1
View File
@@ -15,7 +15,7 @@ new X();
?>
--EXPECTF--
BB
Fatal error: Uncaught EngineException: Class 'X' not found in %sbug47699.php:%d
Fatal error: Uncaught Error: Class 'X' not found in %sbug47699.php:%d
Stack trace:
#0 {main}
thrown in %sbug47699.php on line %d
+1 -1
View File
@@ -6,7 +6,7 @@ $s = "abd";
$s[0]->a += 1;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot use string offset as an object in %sbug47704.php:%d
Fatal error: Uncaught Error: Cannot use string offset as an object in %sbug47704.php:%d
Stack trace:
#0 {main}
thrown in %sbug47704.php on line %d
+1 -1
View File
@@ -16,7 +16,7 @@ $c = new c();
?>
===DONE===
--EXPECTF--
Fatal error: Uncaught EngineException: Call to undefined method b::b() in %s:%d
Fatal error: Uncaught Error: Call to undefined method b::b() in %s:%d
Stack trace:
#0 %s(%d): c->__construct()
#1 {main}
+6 -6
View File
@@ -5,22 +5,22 @@ Bug #48693 (Double declaration of __lambda_func when lambda wrongly formatted)
try {
$x = create_function('', 'return 1; }');
} catch (ParseException $e) {
} catch (ParseError $e) {
echo "$e\n\n";
}
try {
$y = create_function('', 'function a() { }; return 2;');
} catch (ParseException $e) {
} catch (ParseError $e) {
echo "$e\n\n";
}
try {
$z = create_function('', '{');
} catch (ParseException $e) {
} catch (ParseError $e) {
echo "$e\n\n";
}
try {
$w = create_function('', 'return 3;');
} catch (ParseException $e) {
} catch (ParseError $e) {
echo "$e\n\n";
}
@@ -31,12 +31,12 @@ var_dump(
?>
--EXPECTF--
ParseException: syntax error, unexpected '}', expecting end of file in %sbug48693.php(4) : runtime-created function:1
ParseError: syntax error, unexpected '}', expecting end of file in %sbug48693.php(4) : runtime-created function:1
Stack trace:
#0 %sbug48693.php(4): create_function('', 'return 1; }')
#1 {main}
ParseException: syntax error, unexpected end of file in %sbug48693.php(14) : runtime-created function:1
ParseError: syntax error, unexpected end of file in %sbug48693.php(14) : runtime-created function:1
Stack trace:
#0 %sbug48693.php(14): create_function('', '{')
#1 {main}
+1 -1
View File
@@ -7,7 +7,7 @@ $b = &$a[1];
$b = "f";
echo $a;
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php:3
Fatal error: Uncaught Error: Cannot create references to/from string offsets nor overloaded objects in %sbug49866.php:3
Stack trace:
#0 {main}
thrown in %sbug49866.php on line 3
+1 -1
View File
@@ -17,7 +17,7 @@ var_dump(isset($obj->a));
bool(false)
bool(false)
Fatal error: Uncaught EngineException: Closure object cannot have properties in %s:%d
Fatal error: Uncaught Error: Closure object cannot have properties in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
+1 -1
View File
@@ -16,7 +16,7 @@ unset($a->$prop);
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d
Fatal error: Uncaught Error: Cannot access empty property in %s:%d
Stack trace:
#0 %s(%d): A->__unset('')
#1 {main}
+1 -1
View File
@@ -16,7 +16,7 @@ $a->$prop = 2;
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d
Fatal error: Uncaught Error: Cannot access empty property in %s:%d
Stack trace:
#0 %s(%d): A->__set('', 2)
#1 {main}
+1 -1
View File
@@ -16,7 +16,7 @@ var_dump($a->$prop);
?>
--EXPECTF--
Fatal error: Uncaught EngineException: Cannot access empty property in %s:%d
Fatal error: Uncaught Error: Cannot access empty property in %s:%d
Stack trace:
#0 %s(%d): A->__get('')
#1 {main}
-1
View File
@@ -2,7 +2,6 @@
Bug #55156 (ReflectionClass::getDocComment() returns comment even though the class has none)
--INI--
opcache.save_comments=1
opcache.load_comments=1
--FILE--
<?php
+1 -1
View File
@@ -6,7 +6,7 @@ function f(callable $c) {}
f();
?>
--EXPECTF--
Fatal error: Uncaught TypeException: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s:%d
Fatal error: Uncaught TypeError: Argument 1 passed to f() must be callable, none given, called in %s on line 3 and defined in %s:%d
Stack trace:
#0 %s(%d): f()
#1 {main}
+3 -3
View File
@@ -77,8 +77,8 @@ public function setSelf(Foo6 $s) { }
}
--EXPECTF--
Warning: Declaration of Bar4::setSelf() should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d
Warning: Declaration of Bar4::setSelf(Bar4 $s) should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d
Warning: Declaration of Bar5::setSelf() should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d
Warning: Declaration of Bar5::setSelf(Foo5 $s) should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d
Fatal error: Declaration of Bar6::setSelf() must be compatible with Foo6::setSelf(Base $s) in %sbug60573.php on line %d
Fatal error: Declaration of Bar6::setSelf(Foo6 $s) must be compatible with Foo6::setSelf(Base $s) in %sbug60573.php on line %d
+1 -1
View File
@@ -24,7 +24,7 @@ Warning: The magic method __invoke() must have public visibility and cannot be s
Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
Bar
Fatal error: Uncaught EngineException: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d
Fatal error: Uncaught Error: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d
Stack trace:
#0 {main}
thrown in %sbug61025.php on line %d
+23
View File
@@ -0,0 +1,23 @@
--TEST--
Bug #61362 (Exception::getTraceAsString, Exception::__toString not able to handle unicode)
--FILE--
<?php
function test($arg){
throw new Exception();
}
try {
test('тест');
}
catch(Exception $e) {
echo $e->getTraceAsString(), "\n";
echo (string)$e;
}
?>
--EXPECTF--
#0 %s(%d): test('\xD1\x82\xD0\xB5\xD1\x81\xD1\x82')
#1 {main}
Exception in %s:%d
Stack trace:
#0 %s(%d): test('\xD1\x82\xD0\xB5\xD1\x81\xD1\x82')
#1 {main}
Loaded 100 of 1735 files, more files were not shown because too many files have changed in this diff. Show more