Commit Graph

91484 Commits

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