1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Commit Graph

91824 Commits

Author SHA1 Message Date
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