7108db3022
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-17 19:11:54 +03:00
66d4a2e13f
Merge branch 'PHP-5.6' into PHP-7.0
2016-10-17 19:01:12 +03:00
9594e364ed
This is a very very old thing dated back to year 2009.
...
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
2016-10-17 18:58:14 +03:00
96ed946b2b
Merge branch 'pull-request/2097'
2016-10-17 16:03:12 +01:00
63166412a2
Merge branch 'pull-request/2097'
2016-10-17 16:02:51 +01:00
bd6bce888a
news entry for pr #2158
2016-10-17 15:50:59 +01:00
8d6cc00cbd
Merge branch 'pull-request/2158'
2016-10-17 15:48:32 +01:00
cc80ca9b84
news entry for pr #2158
2016-10-17 14:47:08 +01:00
ae6fc21f14
Merge branch 'pull-request/2158'
2016-10-17 14:46:03 +01:00
6091873d4a
Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
...
This reverts commit 2d8ab51576
2016-10-17 14:22:55 +01:00
5fa76095bb
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
2016-10-17 14:12:15 +01:00
fe02227524
sync news from 7.1.0RC4
2016-10-17 14:11:39 +01:00
0820c94382
also fix 32bits test for microsecond
2016-10-17 15:07:56 +02:00
6766a985eb
bump news version
2016-10-17 11:31:34 +01:00
72041580bd
Update 7.1 NEWS for bug #71148
2016-10-17 12:52:34 +11:00
23e2c356b7
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-17 12:40:54 +11:00
8be59a1301
Fixed bug #71148 (Bind reference overwritten on PHP 7)
2016-10-17 12:40:14 +11:00
f8c2089651
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 15:46:33 +02:00
d82da7de3a
Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)
2016-10-16 15:41:37 +02:00
47bd3d982e
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-16 13:48:13 +02:00
e93eaee164
Fixed bug #70776 (Simple SIGINT does not have any effect)
2016-10-16 13:47:49 +02:00
601ab6e9d0
Fix searching for catch blocks
...
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number
2016-10-16 12:34:10 +02:00
9f472ba5e3
Various function info fixes
2016-10-15 23:58:31 +02:00
659cc278e2
Various RC inference fixes
2016-10-15 23:58:29 +02:00
1903fc6298
Fix SplFixedArray::offsetGet() invocation for NULL offset
2016-10-15 23:58:28 +02:00
b1fc1fb937
Normalize preg_replace_callback() return value
...
One particular error case was returning the argument without
casting to string.
2016-10-15 23:58:26 +02:00
663491b9ba
Update to SQLite 3.15.0
2016-10-15 19:46:00 +02:00
3d7cd272ef
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync NEWS
2016-10-14 19:52:52 +02:00
6d91772c2f
sync NEWS
2016-10-14 19:52:04 +02:00
20b1029e4c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
bump ext/zip version
2016-10-14 17:31:26 +02:00
f1cf340e19
bump ext/zip version
2016-10-14 17:31:07 +02:00
2cc3aeb4b9
Implement #72918 : negative offset inside a quoted string leads to parse error
...
We allow negative numeric offsets for the simple syntax inside
double-quoted and heredoc strings.
2016-10-14 14:14:08 +02:00
6e3ab61fa5
Update NEWS
...
This entry has been lost due to a bad merge.
2016-10-14 13:52:21 +02:00
386aff451b
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-14 12:25:16 +02:00
466870e2b0
Fix memory leak when compiling files in phpdbg
2016-10-14 12:24:28 +02:00
aecd165b8f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
use zend_error instead of zend_error_noreturn
2016-10-14 10:54:47 +02:00
428ef50838
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
use zend_error instead of zend_error_noreturn
2016-10-14 10:54:09 +02:00
e1f5b6d8df
use zend_error instead of zend_error_noreturn
2016-10-14 10:53:40 +02:00
65e6f7e16f
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-14 08:09:29 +02:00
d0b9d72da7
Merge branch 'PHP-5.6' into PHP-7.0
2016-10-14 08:08:10 +02:00
f7bf9650aa
add missing NEWS entries for 5.6.27
2016-10-14 08:06:14 +02:00
84a5821212
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0: (62 commits)
missed piece for renaming
rename publicly exposed symbol to avoid name conflicts
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
Fix #73280 : Stack Buffer Overflow in GD dynamicGetbuf
use already exported symbol
Revert "export symbol missing by phpdbg"
Fix outlen for openssl function
Syncronize with 5.6 - __toString should return ""
Fix potential overflows in php_pcre_replace_impl
Fixed bug #73237
Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
Update NEWS
Fix phpdbg tests after lineno change
Fix line number of implicit return in pseudo-main scope
export symbol missing by phpdbg
Fix accidental PHPDBG_ABI break
Fix bug #73189 - Memcpy negative size parameter php_resolve_path
update len in fallback cases
Add stdin command and -s command line parameter to phpdbg
Fix bug #73190 : memcpy negative parameter _bc_new_num_ex
...
2016-10-14 04:19:16 +02:00
d35d9d1d0e
missed piece for renaming
...
(cherry picked from commit 5ba9eab436
2016-10-14 02:08:28 +02:00
dd604015be
rename publicly exposed symbol to avoid name conflicts
...
(cherry picked from commit 730288ae41
2016-10-14 02:08:14 +02:00
990e2ce2a0
Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
...
(cherry picked from commit d14498a475
2016-10-14 02:03:46 +02:00
c79f9a4e49
fix gettimeofday proto availability
...
(cherry picked from commit 79f7d174d0
2016-10-14 02:03:02 +02:00
0864915550
Fix #73280 : Stack Buffer Overflow in GD dynamicGetbuf
...
We make sure to never pass a negative `rlen` as size to memcpy().
Cf. <https://github.com/libgd/libgd/commit/53110871 >.
(cherry picked from commit cc08cbc84d
2016-10-14 02:02:42 +02:00
20b63996c0
fix test
...
(cherry picked from commit 57354e0313
2016-10-14 02:01:53 +02:00
5ce2230266
use already exported symbol
...
(cherry picked from commit ce3e792c2c
2016-10-14 02:01:22 +02:00
ee42529750
Revert "export symbol missing by phpdbg"
...
This reverts commit 611ab7fe5b3104882cf8
2016-10-14 02:01:08 +02:00
Andrey Hristov