Xinchen Hui
18cf4e0a8a
Fixed fpm-side (tests passes)
2015-05-23 19:01:41 +08:00
Xinchen Hui
fef18f4bea
Merge branch 'master' into merge-fastcgi
2015-05-23 10:29:45 +08:00
Anatol Belski
8d7003f708
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test
Add entry for bug #69354 , fixed in 5.5.25
Add CVE for bugs in 5.6.9
Add entry about PCRE upgrade (rev 95fa7279
)
Add CVE for bugs in 5.5.25
Conflicts:
ext/phar/tests/bug69441.phpt
2015-05-22 21:32:40 +02:00
Anatol Belski
0bc3a74334
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2015-05-22 21:27:19 +02:00
Anatol Belski
d9c266f4c9
fix test
...
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
2015-05-22 21:25:52 +02:00
Lior Kaplan
2e2cbcc926
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add entry for bug #69354 , fixed in 5.5.25
Add entry about PCRE upgrade (rev 95fa7279
)
Add CVE for bugs in 5.5.25
2015-05-22 11:18:32 +03:00
Lior Kaplan
827d2c1415
Add entry for bug #69354 , fixed in 5.5.25
2015-05-22 11:17:01 +03:00
Lior Kaplan
f736934af0
Add CVE for bugs in 5.6.9
2015-05-22 11:15:36 +03:00
Lior Kaplan
7ecab5d23f
Add entry about PCRE upgrade (rev 95fa7279
)
2015-05-22 11:02:01 +03:00
Lior Kaplan
c9ac441fe8
Add CVE for bugs in 5.5.25
2015-05-22 10:58:28 +03:00
Xinchen Hui
50688e3984
Forgot the test for bug #69688
2015-05-22 11:50:55 +08:00
Xinchen Hui
95da6b76f3
Fixed test
2015-05-22 11:49:15 +08:00
Xinchen Hui
8c0ba65d6a
Fixed bug #69688 (segfault with eval and opcache fast shutdown)
2015-05-22 11:48:13 +08:00
Anthony Ferrara
ed4052f1d5
Fixed bug #69686 password_verify reports back error on PHP7 will null string.
...
The deprecation of DES salts created a warning when trying to verify them with password_hash. This bug fix adds a quiet mode to php_crypt() which is used by password_verify.
2015-05-21 17:12:51 -04:00
Nikita Popov
3dba00bc31
Fix scope_is_known() for class constants
...
Here the active_op_array is still the surrounding file, but we
do know the scope.
2015-05-21 21:07:05 +02:00
Dmitry Stogov
f186d4b8b1
Fixed build with DEBUG_COMPACT_LITERALS=1
2015-05-21 17:57:06 +03:00
Dmitry Stogov
58c484a0bb
Fixed typo in ZEND_GCC_GLOBAL_REGS configure test (Albert)
2015-05-21 16:34:59 +03:00
Peter Cowburn
474e4220ef
removed old news item
...
This change was introduced in PHP 5.5.21 and 5.6.5
2015-05-21 13:17:27 +01:00
Remi Collet
aec039cc6e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
2015-05-21 14:07:14 +02:00
Remi Collet
68e368ed34
NEWS
2015-05-21 14:07:02 +02:00
Remi Collet
17d5ebe76e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
2015-05-21 14:06:26 +02:00
Remi Collet
a7de68f98a
Fixed bug #69680 (phar symlink in binary directory broken).
...
Relative symlink are better, as relative to link directory.
2015-05-21 14:05:15 +02:00
ponce
c3d983f3af
Make the phar symlink relative
...
or we got a symlink pointing to the build files
thanks also to remicollet
2015-05-21 14:03:18 +02:00
Anatol Belski
5acddf898f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
remove duplicated declaration, fix build
2015-05-21 10:57:30 +02:00
Anatol Belski
4fe938b0a9
remove duplicated declaration, fix build
2015-05-21 10:56:14 +02:00
Anatol Belski
928e9e980b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628 : complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
2015-05-21 09:49:18 +02:00
Anatol Belski
e85653051a
updated NEWS
2015-05-21 09:47:59 +02:00
Anatol Belski
fc94fb3e5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628 : complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
2015-05-21 09:47:30 +02:00
Anatol Belski
c507c533bd
updated NEWS
2015-05-21 09:47:02 +02:00
Christoph M. Becker
96629091a6
added missing GLOB_BRACE support check
2015-05-21 09:44:18 +02:00
Christoph M. Becker
6895ae4553
added SKIPIF section to test to make sure that GLOB_BRACE is supported
2015-05-21 09:44:17 +02:00
Christoph M. Becker
8c6e8e7870
fix #69628 : complex GLOB_BRACE fails on Windows
2015-05-21 09:44:15 +02:00
Christoph M. Becker
90aee01c85
added PHPT to check for bug #69628
2015-05-21 09:44:14 +02:00
Anatol Belski
eef762d576
Merge branch 'pull-request/1278'
2015-05-21 08:52:41 +02:00
Anatol Belski
360d8fd712
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix handling VAR vs VAR= in putenv
2015-05-21 08:22:30 +02:00
Anatol Belski
ad4d022bdf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix handling VAR vs VAR= in putenv
2015-05-21 08:21:53 +02:00
Anatol Belski
75286ece1a
fix handling VAR vs VAR= in putenv
...
using _putenv_s eliminates behavior diff in TS/NTS
2015-05-21 08:19:54 +02:00
Bob Weinand
9b6bb2d451
Add support for string dictionaries, fix array dictionaries ({de,in}flate)
2015-05-21 04:17:17 +02:00
Dmitry Stogov
ca64b41b99
Fixed zend_update_class_constants() to always resolve all constants.
...
Call zend_update_class_constants() only when necessary.
2015-05-21 04:13:10 +03:00
Adam Harvey
0c50f49710
Add documentation contribution information.
2015-05-20 19:26:20 -05:00
Adam Harvey
81f4a7dfc1
Add a bare bones CONTRIBUTING.md.
...
I was not at all guilted into this by the open source summit at php[tek]. Not
at all.
(such guilt)
This is based mostly on information already on our Web site, and is primarily a
set of links to other pages. Still, if we can encourage more contributors,
let's do it!
2015-05-20 19:13:52 -05:00
Dmitry Stogov
0da206e4b7
Set proper type_info flags.
2015-05-21 00:51:34 +03:00
Dmitry Stogov
cf6ac5c665
Fixed SHM+FILE cache with opcache.protect_memory=1
2015-05-20 23:33:55 +03:00
Dmitry Stogov
5ff5201543
Improved script copyining from SHM to process memory
2015-05-20 23:12:04 +03:00
Dmitry Stogov
d6bcf2bf2e
Micro optimization
2015-05-20 22:51:45 +03:00
Dmitry Stogov
e57aceed42
Fixed access to wrong opline (it may be the last ZEND_THROW in op_array->opcodes)
2015-05-20 22:49:37 +03:00
Christoph M. Becker
99d7852d18
added missing GLOB_BRACE support check
2015-05-20 20:23:21 +02:00
Anatol Belski
5ea429494e
add license header
2015-05-20 19:14:09 +02:00
Anatol Belski
fad25c9306
add license header
2015-05-20 19:14:07 +02:00
Anatol Belski
514aa4ef53
remove dead code
2015-05-20 19:14:06 +02:00