Anatol Belski
afb6ca2566
Finish remaining replacement uint => uint32_t
...
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
Nikita Popov
ce97ead399
Merge branch 'PHP-7.1'
2016-12-22 12:47:50 +01:00
Nikita Popov
175b9f67f6
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 12:47:29 +01:00
Sébastien Santoro
25c96f92f4
Fix IS_UNDEF comparisons in opcache
...
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.
Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
2016-12-22 12:46:14 +01:00
Anatol Belski
d5a3838c65
fix min supported versions
2016-12-22 12:40:58 +01:00
Yasuo Ohgaki
4899109e7b
Update NEWS
2016-12-22 16:04:28 +09:00
Yasuo Ohgaki
a93a51c3bf
Fix bug #73100 - Improve bug fix. Forbid to set 'user' save handler other than set_save_handler().
2016-12-22 16:04:28 +09:00
Kalle Sommer Nielsen
d4831e2d0a
Eliminate win95nt.h
...
- Most of this is builtin php.h now
- Removed some dead defines
- We now pass /D _USE_MATH_DEFINES for M_PI etc
2016-12-22 06:51:18 +01:00
Kalle Sommer Nielsen
a569d003e2
Hmm actually it seems to be the other way around, Anatol?
2016-12-22 05:53:13 +01:00
Kalle Sommer Nielsen
f0f3cb6ab5
Merge branch 'master' of git.php.net:php-src
2016-12-22 05:47:00 +01:00
Kalle Sommer Nielsen
34283026da
Sync the default value of --with-odbcver with the hardcoded default for ODBCVER
2016-12-22 05:46:12 +01:00
Anatol Belski
837cce3b0b
move the defs to the right place
2016-12-22 02:17:55 +01:00
Bob Weinand
5d7ce72747
Merge branch 'PHP-7.1'
2016-12-22 00:42:05 +01:00
Bob Weinand
728502fc29
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-22 00:40:54 +01:00
Bob Weinand
3b2b080cbc
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
2016-12-22 00:39:24 +01:00
Nikita Popov
3df43437fe
Merge branch 'PHP-7.1'
2016-12-21 22:12:17 +01:00
Nikita Popov
ed0602fe31
Fix string extension in negate_num_string
...
Forgot to actually assign the reallocated string...
2016-12-21 22:11:17 +01:00
Nikita Popov
114b526649
Merge branch 'PHP-7.1'
2016-12-21 21:28:36 +01:00
Nikita Popov
06699abffb
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 21:28:29 +01:00
Nikita Popov
c41826d1e6
Increase timing quota for small string concat test
...
Test is regularly failing on Travis.
2016-12-21 21:27:47 +01:00
Nikita Popov
a1fd1053f5
Merge branch 'PHP-7.1'
2016-12-21 21:19:28 +01:00
Nikita Popov
509f26c4bb
Drop some dead code in ext/reflection
2016-12-21 21:19:19 +01:00
Nikita Popov
9afc61c214
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 21:19:10 +01:00
David Walker
5733fd1caf
Fix #73753 - Unpacked Arrays and Duplication
2016-12-21 21:18:20 +01:00
Anatol Belski
ce0669c892
Merge branch 'PHP-7.1'
...
* PHP-7.1:
add folds
fix possible null dereference
2016-12-21 18:00:45 +01:00
Anatol Belski
6ffa1d256f
add folds
2016-12-21 17:59:45 +01:00
Anatol Belski
637436628a
fix possible null dereference
2016-12-21 17:58:34 +01:00
Anatol Belski
5e6faf2306
add UPGRADING and NEWS items
2016-12-21 16:10:38 +01:00
Anatol Belski
5e2ed8c809
Raise the supported API to win7/server 2008r2
2016-12-21 15:59:45 +01:00
Xinchen Hui
b6553d422d
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
2016-12-21 14:27:13 +08:00
Xinchen Hui
82988d3e41
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
...
This reverts commit a12f43ee2c
2016-12-21 14:24:14 +08:00
Bob Weinand
942d4d5614
Merge branch 'PHP-7.1'
2016-12-21 02:43:04 +01:00
Bob Weinand
7e2146293b
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 02:42:38 +01:00
Bob Weinand
becda86ae5
Fix issue with -- in phpdbg command line
2016-12-21 02:42:23 +01:00
Yasuo Ohgaki
7774fd1916
Update NEWS and UPGRADING
2016-12-21 08:16:38 +09:00
Yasuo Ohgaki
c3982d055c
Merge branch 'pull-request/2233'
...
* pull-request/2233:
Remove "register_globals" support codes from php/php_binary serializers. As a result, users may use PS_UNDEF_MAKER(=!) char for session variable name.
2016-12-21 08:07:49 +09:00
Yasuo Ohgaki
bf5c502e3d
Remove "register_globals" support codes from php/php_binary serializers.
...
As a result, users may use PS_UNDEF_MAKER(=!) char for session variable name.
2016-12-21 08:07:14 +09:00
Bob Weinand
c3ee875aec
Merge branch 'PHP-7.1'
2016-12-20 20:18:53 +01:00
Bob Weinand
8b06b7e266
Fixed bug #73794 (Crash (out of memory) when using run and # command separator)
2016-12-20 20:18:36 +01:00
Bob Weinand
e4db84f231
Merge branch 'PHP-7.1'
2016-12-20 19:49:25 +01:00
Bob Weinand
3273f15412
Fix segfault in ZTS mode when just printing and exiting in phpdbg
2016-12-20 19:49:04 +01:00
Adam Baratz
d58231dda3
Add "Sent SQL" to debug dump for emulated prepares
2016-12-20 11:07:04 -05:00
Adam Baratz
6c692313af
Remove PDOStatement::activeQueryString()
2016-12-20 11:06:38 -05:00
Dmitry Stogov
9251d4c056
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
2016-12-20 16:54:53 +03:00
Dmitry Stogov
088dd88eeb
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73792 (invalid foreach loop hangs script)
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 16:54:28 +03:00
Dmitry Stogov
43cc3d7d92
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73792 (invalid foreach loop hangs script)
2016-12-20 16:53:06 +03:00
Dmitry Stogov
3c6a2fb08c
Fixed bug #73792 (invalid foreach loop hangs script)
2016-12-20 16:48:57 +03:00
Xinchen Hui
0bad73f512
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 21:01:38 +08:00
Xinchen Hui
6bd41a1d47
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 21:01:21 +08:00
Anatol Belski
747b18ff5c
Merge branch 'PHP-7.1'
...
* PHP-7.1:
deliver the real cp also if a constant is passed
2016-12-20 02:44:40 +01:00
