Rasmus Lerdorf
a63f33b282
Support uwsgi sapi in opcache
2015-12-14 06:11:00 -08:00
Anatol Belski
0ec58fa32b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Refactor password_hash to use random_bytes internally to generate salts
2015-12-14 09:15:36 +01:00
Anthony Ferrara
02e85045dc
Refactor password_hash to use random_bytes internally to generate salts
2015-12-14 09:05:16 +01:00
Xinchen Hui
9b148d31d3
Fixed bug #71100 (long2ip() doesn't accept integers in strict mode)
2015-12-14 14:55:44 +08:00
Nikita Popov
d5597fa01f
Merge branch 'PHP-7.0'
2015-12-14 00:29:57 +01:00
Nikita Popov
7dc5bc5063
Do not swap operands in array addition
...
As we support constant array operands nowadays, the original check
didn't work anymore.
2015-12-14 00:29:05 +01:00
Xinchen Hui
4a732e97b4
Merge branch 'optimize-strtolower' of https://github.com/hnw/php-src
2015-12-12 22:57:44 -08:00
Xinchen Hui
145b68c834
Merge branch 'PHP-7.0'
2015-12-12 22:52:51 -08:00
Xinchen Hui
4171a8f6c6
Internal function argumensts cleanup (strict_types)
2015-12-12 22:52:37 -08:00
Xinchen Hui
daefe53869
Merge branch 'PHP-7.0'
2015-12-12 22:38:15 -08:00
Xinchen Hui
a9026070b6
Fixed test
2015-12-12 22:37:50 -08:00
Yoshio HANAWA
fa78da9901
Optimize strtolower()/strtoupper()
2015-12-13 14:22:50 +09:00
Christopher Jones
78f157f687
Merge branch 'PHP-7.0'
2015-12-13 08:22:30 +11:00
Christopher Jones
e0691d27d5
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-13 08:22:14 +11:00
Christopher Jones
82d58e6cbc
Update README
2015-12-13 08:21:41 +11:00
Christopher Jones
6ddc45b9c1
Merge branch 'PHP-7.0'
2015-12-12 16:08:14 +11:00
Christopher Jones
e4a48ab6b3
Prepare for a PECL release
2015-12-12 16:07:57 +11:00
Christopher Jones
8f7e98ac4a
Prepare for a PECL release
2015-12-12 16:06:08 +11:00
Anatol Belski
157d0372e0
backported 7c981192eb from 7.0
...
the way it doesn't hurt BC
2015-12-11 17:39:57 +01:00
Nikita Popov
b343cd913b
Merge branch 'PHP-7.0'
2015-12-11 16:33:47 +01:00
Nikita Popov
04407b79df
Fixed bug #71094
...
I didn't see any non-dummy readline tests to work off, so this
change is tested manually only.
While at it also fix other zval_dtors and use ZVAL_COPY.
2015-12-11 16:33:07 +01:00
Dmitry Stogov
1fdb63fbd9
ws fixes
2015-12-11 17:40:23 +03:00
Dmitry Stogov
21ba287c3c
dos2unix
2015-12-11 17:29:42 +03:00
Dmitry Stogov
f243aaf985
Added e-SSA based DFA optimisation framework (incomplete)
2015-12-11 17:24:55 +03:00
Dmitry Stogov
061a90f8d1
Describe special meaning of IS_UNUSED oprerand
2015-12-11 02:31:28 +03:00
Dmitry Stogov
dc36810993
Use more compact description encoding schema to free some bits
2015-12-11 01:45:26 +03:00
Nikita Popov
fc2cedfb1d
Make 2nd arg of xml_set_object by value
...
The argument is not being modified. Probably holdover from PHP 4
days.
2015-12-10 23:35:25 +01:00
Dmitry Stogov
047c84521c
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Make duplicate class constant error for internal class
Make ZEND_CLONE return a TMP_VAR
2015-12-11 00:48:20 +03:00
Dmitry Stogov
cba1a8498c
Improve Optimizer debugging facility (print the meaning of extended_value)
2015-12-11 00:47:02 +03:00
Nikita Popov
04e3d82b55
Make duplicate class constant error for internal class
...
And drop two duplicate constant declarations from intl. These
were leaking previously.
2015-12-10 22:22:49 +01:00
Nikita Popov
3d4a2d2002
Merge branch 'PHP-7.0'
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2015-12-10 18:24:29 +01:00
Nikita Popov
798d168d73
Make update_opN_const implementation symmetric
...
So the main structure is the same...
2015-12-10 18:18:10 +01:00
Nikita Popov
37f3425263
Fix Foo::${42} and similar
...
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.
Fixes analogeous segfault for ${42} on opcache eval as well.
2015-12-10 18:14:40 +01:00
Dmitry Stogov
cedb518ea1
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
The first arg is optional
Return -1 seems bug here
2015-12-10 15:34:15 +03:00
Xinchen Hui
ec0ac5dafb
Merge branch 'PHP-7.0'
2015-12-10 19:37:44 +08:00
Xinchen Hui
c096a281be
The first arg is optional
2015-12-10 19:36:41 +08:00
Xinchen Hui
c0ff9b07cf
Merge branch 'PHP-7.0'
2015-12-10 17:35:55 +08:00
Xinchen Hui
e4ad9ed8ad
Return -1 seems bug here
2015-12-10 17:35:35 +08:00
Dmitry Stogov
3b5c844757
Initialize bitset before processing the seconf BB (we skip the first one)
2015-12-10 11:29:53 +03:00
Xinchen Hui
ae537994a6
Merge branch 'PHP-7.0'
2015-12-10 15:02:33 +08:00
Xinchen Hui
29b615cfcf
iFixed key leak with invalid resource
2015-12-10 15:02:01 +08:00
Xinchen Hui
c13fcc21c3
Merge branch 'PHP-7.0'
2015-12-10 08:58:37 +08:00
Xinchen Hui
7c1ddcc67f
Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters)
2015-12-10 08:58:28 +08:00
Dmitry Stogov
fd20e6cee6
Apply local optimizatons to extended bacic block (this allows some optimizarions across few following BBs).
2015-12-10 01:17:35 +03:00
Dmitry Stogov
7fd7734e58
Explain the disabled optimization pattern
2015-12-09 22:22:07 +03:00
Dmitry Stogov
4fd30c9565
Improve debugging of non-local variables
2015-12-09 17:21:57 +03:00
Dmitry Stogov
d2597ad20b
Improved optimizer dubugging facility
2015-12-09 14:52:00 +03:00
Anatol Belski
9aae3788cc
Merge branch 'PHP-7.0'
...
* PHP-7.0:
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909 .
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
fix path separator in test
Bumped SAPI version to 6.9
Added "mod_auth_basic" to apache module list.
Add sanitizing checks for request data.
Clear secret after use.
Fixed __DIR__ in CLI mode.
Add PDO_Firebird fix in NEWS
2015-12-09 12:05:18 +01:00
Anatol Belski
906670b817
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909 .
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
fix path separator in test
Bumped SAPI version to 6.9
Added "mod_auth_basic" to apache module list.
Add sanitizing checks for request data.
Clear secret after use.
Fixed __DIR__ in CLI mode.
Add PDO_Firebird fix in NEWS
2015-12-09 12:05:01 +01:00
Michael Orlitzky
24f21a3012
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909 .
...
The test program for utf8_to_mutf7 attempts to call it without
arguments. The function expects one argument, however, and this leads
to a segfault as reported in PHP bug #66909 .
The test program is using the PHP_IMAP_TEST_BUILD macro which
complicates things a little. To keep this diff small, the
PHP_IMAP_TEST_BUILD macro was modified to pass a fifth argument
"extra-source" to the PHP_TEST_BUILD macro. The check for
utf8_to_mutf7 was then modified to check for a dummy function,
utf8_to_mutf7_php, which passes the correct number of arguments to
utf8_to_mutf7.
PHP-Bug: https://bugs.php.net/bug.php?id=66909
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=376735
2015-12-09 12:04:16 +01:00
