02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
cb17c99511
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:31:37 +04:00
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
3550f3d0aa
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
2013-07-30 17:35:19 +04:00
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
ef3d813d2c
Fixed bug #65336
2013-07-27 05:54:33 +09:00
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
b8c8a04a85
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
96a53f6715
Merge branch 'bug65028' into PHP-5.4
...
* bug65028:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:44:06 -07:00
f9000fde98
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
...
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697 .
2013-07-23 11:15:43 -07:00
f00d796b7e
fix missing include
2013-07-23 18:06:51 +02:00
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
5a8b0ca8fa
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-23 12:57:08 +02:00
c28ab73d73
Fix compiler warning on redefined constant
2013-07-23 12:50:37 +02:00
8aebe0f1e7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:07 +02:00
9b6aa268a3
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 09:59:08 +02:00
f8efdc2b4b
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-22 00:57:33 -07:00
b8d4a6939e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:14:42 -07:00
1b4103c09d
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:12:54 -07:00
83ced9124e
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:47:10 -07:00
476924ec3d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:19 -07:00
da3886de6d
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:25:21 -07:00
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07:00
e7a00a2566
add a few comment
2013-07-21 21:14:38 -07:00
f51b8d8820
allow both the old and new cfg argument to work. (the old of course should contain the typo)
2013-07-21 21:12:19 -07:00
b8941a73cc
mssql.compatability_mode fix
2013-07-21 21:12:16 -07:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
3363e04fb4
intl: remove extra quotes from arginfo params
2013-07-21 03:30:28 +02:00
d8dd4d9b02
fix header include
...
stddef.h is needed to have offsetof macros on windows (at least)
2013-07-18 15:28:20 +02:00
31edf4df56
regenerate url scanner
2013-07-17 16:28:01 +01:00
94ab37f06a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:19:53 +01:00
e6ae977082
Fixed bug #50308 - session id not appended properly for empty anchor tags
...
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
2013-07-17 16:07:26 +01:00
0d3d739bf7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:05:23 +01:00
ba3234888d
Fix bug #62129 - rfc1867 crashes php even though turned off
...
Patch by gxd305 at gmail dot com
2013-07-17 11:02:48 +01:00
fd5cdf89a8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2013-07-16 18:05:45 +02:00
bb6d74918e
fix TS build
2013-07-16 18:05:14 +02:00
f37ac6f591
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added sapi check for dl() test
2013-07-16 15:43:37 +02:00
135f81c5ae
added sapi check for dl() test
2013-07-16 15:42:38 +02:00
e1a0c90b8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-16 13:55:32 +02:00
d3a4af4db8
Make zval2myslqnd implementations aware of inheritance
2013-07-16 13:52:57 +02:00
54b740a7e1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:29 +02:00
bcb39d9c6a
Fixed typo ensuring header str is \0 terminated
...
This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.
2013-07-16 00:14:05 +02:00
710150ccb7
socket: support unix paths in the abstract namespace
...
Those starting with '\0'.
2013-07-15 23:57:51 +02:00
e2744f1aa3
socket: fix bug #65260 (SCM_RIGHTS)
...
The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.
Any of these two bugs would probably be enough to cause heap
corruption.
2013-07-15 23:57:49 +02:00
904c5d7ba8
kick unused var
2013-07-15 17:23:16 +02:00
68e630b72f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:35 -07:00
e617679c0b
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
2013-07-15 00:36:29 -07:00
Dmitry Stogov