Xinchen Hui
3a8a99e662
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73532 (Null pointer dereference in mb_eregi)
2016-11-16 15:05:22 +08:00
Xinchen Hui
229024c725
Fixed bug #73532 (Null pointer dereference in mb_eregi)
2016-11-16 15:05:04 +08:00
Adam Baratz
83086d9a72
Add PDOStatement::activeQueryString()
2016-11-15 17:33:38 -05:00
Andrea Faulds
a0502b89a6
Convert numeric keys in object/array casts
...
RFC: https://wiki.php.net/rfc/convert_numeric_keys_in_object_array_casts
This converts key types as appropriate in object to array and array to object
casts, as well as in get_object_vars().
2016-11-14 18:20:45 +00:00
Christoph M. Becker
531eedf38f
Merge branch 'PHP-7.1'
2016-11-14 16:09:40 +01:00
Christoph M. Becker
d6c36e9af7
Update to SQLite 3.15.1
2016-11-14 14:55:13 +01:00
Christoph M. Becker
189bbb586c
Merge branch 'pull-request/2164'
2016-11-13 23:31:40 +01:00
Christoph M. Becker
1ccada35c0
Fix tests: don't count non-countables
2016-11-13 18:16:17 +01:00
Joe Watkins
54fbc27270
Merge branch 'master' of git.php.net:/php-src
2016-11-13 05:40:49 +00:00
Joe Watkins
f77be645bc
news entry for #1787
2016-11-13 05:37:49 +00:00
Joe Watkins
77efe76bf7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
news entry for #1787
move declaration of vars to top
add test for #69587
fix bug #69587 DateInterval properties and isset
2016-11-13 05:34:11 +00:00
jhdxr
0bd63959c9
move declaration of vars to top
2016-11-13 05:32:24 +00:00
jhdxr
9ad2083773
add test for #69587
2016-11-13 05:32:24 +00:00
jhdxr
23f9e48273
fix bug #69587 DateInterval properties and isset
2016-11-13 05:32:24 +00:00
Anatol Belski
9593663d22
restore erroneously removed part
2016-11-13 00:04:10 +01:00
Nikita Popov
547ad56b31
Fix build
2016-11-12 22:17:21 +01:00
Joe Watkins
24329e5286
Merge branch 'master' of git.php.net:/php-src
2016-11-12 17:57:41 +00:00
Joe Watkins
011afaf9c4
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
2016-11-12 17:57:20 +00:00
Nikita Popov
9dcc76f4c8
Merge branch 'PHP-7.1'
2016-11-12 18:49:50 +01:00
Nikita Popov
5f4f83220a
Don't inline if function has ref arguments
...
Otherwise we end up leaving opcodes like FETCH_DIM_W behind. The
test case demonstrates a leak in particular.
2016-11-12 18:49:41 +01:00
Edgar R. Sandi
81e9a0d075
fixed bug generated by fixes bug #73135
2016-11-12 17:49:25 +00:00
Joe Watkins
147f1f2e3b
fix news
2016-11-12 17:46:40 +00:00
Edgar R. Sandi
72be8de39f
fixed bug generated by fixes bug #73135
2016-11-12 17:43:16 +00:00
Edgar R. Sandi
1631c61feb
phpt file to bug #73135
2016-11-12 17:43:16 +00:00
Edgar R. Sandi
319822b050
fixes bug #73135
2016-11-12 17:43:16 +00:00
Joe Watkins
0c76451c85
Merge branch 'PHP-7.1'
...
* PHP-7.1:
news entry for calendar overflow fix
Fix integer overflow in calender.
2016-11-12 17:36:16 +00:00
Joe Watkins
2d865dfd35
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
news entry for calendar overflow fix
Fix integer overflow in calender.
2016-11-12 17:35:24 +00:00
Joshua Rogers
1b8cfaf23d
Fix integer overflow in calender.
...
Fix int overflows in conversation functions for calendar.
Add tests for the overflows.
2016-11-12 17:33:51 +00:00
Kalle Sommer Nielsen
2104bea5d7
Remove Netware support
...
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Kalle Sommer Nielsen
b3093082fd
Merge branch 'master' of git.php.net:php-src
2016-11-12 11:18:42 +01:00
Kalle Sommer Nielsen
4cef0ead49
Fix Windows build
2016-11-12 11:18:25 +01:00
Joe Watkins
28ebf8df66
Merge branch 'PHP-7.1'
...
* PHP-7.1:
added a test for date_interval_format function
Merge branch 'pull-request/2198'
2016-11-12 10:00:17 +00:00
Joe Watkins
d1910f66e5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
added a test for date_interval_format function
Merge branch 'pull-request/2198'
2016-11-12 09:59:24 +00:00
Jean Carlo Machado
f578ce3a13
added a test for date_interval_format function
2016-11-12 09:57:50 +00:00
Joe Watkins
ff1986e4d7
Merge branch 'pull-request/2198'
2016-11-12 08:16:01 +00:00
Joe Watkins
41e04dbec0
Merge branch 'pull-request/2198'
2016-11-12 08:15:52 +00:00
Mitch Hagstrand
3b830cfb5c
Fix the lchwon error test for Travis CI.
...
The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.
https://github.com/php/php-src/blob/6053987bc27e8dede37f437193a5cad448f99bce/ext/standard/filestat.c#L406
2016-11-11 16:17:07 -08:00
Nikita Popov
0d25376900
Merge branch 'PHP-7.1'
2016-11-10 22:52:22 +01:00
Nikita Popov
3c8beb16c4
Allow early-binding of ZEND_NEW args
2016-11-10 22:52:15 +01:00
Nikita Popov
739698c493
Merge branch 'PHP-7.1'
2016-11-10 22:28:42 +01:00
Nikita Popov
8106c01afc
Fix block pass leaks
2016-11-10 22:28:32 +01:00
Nikita Popov
dac600e469
Merge branch 'PHP-7.1'
2016-11-10 22:19:52 +01:00
Nikita Popov
62af7e0db8
Merge branch 'PHP-7.0' into PHP-7.1
2016-11-10 22:19:48 +01:00
Nikita Popov
bb3d0c0e17
Fcall optimization: Avoid FETCH_DIM_R with UNUSED op2
2016-11-10 21:36:46 +01:00
Nikita Popov
976d72a3bd
Merge branch 'PHP-7.1'
2016-11-10 14:59:56 +01:00
Nikita Popov
3048428cf0
Don't elide undef var notice
2016-11-10 14:58:54 +01:00
Nikita Popov
4f76073b6d
Set result of FREE to unused in block pass
2016-11-10 14:55:52 +01:00
Nikita Popov
570e7fa331
Fix ext/xml func info
2016-11-10 14:55:50 +01:00
Nikita Popov
0378121c64
Range inference cleanup
...
Replace inline #ifdefs with some macros. Fix build if NEG_RANGE is
disabled. Fix some typos. Add some comments.
2016-11-10 14:55:40 +01:00
Dmitry Stogov
f34a00dbd8
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Don't update proprties inplace.
2016-11-10 12:34:24 +03:00