ba4fddd2da
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66182 exit in stream filter produces segfault
2014-04-03 09:08:35 +02:00
7ab5c593f7
Fix bug #66182 exit in stream filter produces segfault
...
Unfortunately, a segv caused by exit cannot be tested reliably.
2014-04-03 09:07:35 +02:00
9eb0c634d4
NEWS
2014-04-02 15:38:22 +02:00
f453917f62
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:37:50 +02:00
1ec83d44a1
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:36:39 +02:00
68556f3384
NEWS
2014-04-02 11:13:21 +02:00
af147ac9b7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64330
2014-04-02 11:10:59 +02:00
91a9d24aa3
Fix bug #64330
...
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
2014-04-02 11:09:26 +02:00
8e238148f9
updated NEWS
2014-04-01 10:12:56 +02:00
eb84d5d0a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
added test for bug #53965
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
2014-04-01 10:12:06 +02:00
f244513fc0
updated NEWS
2014-04-01 10:11:40 +02:00
fca1501ed6
added test for bug #53965
2014-04-01 10:08:08 +02:00
3cb056f523
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
2014-04-01 10:07:18 +02:00
60fb57d4f6
NEWS
2014-03-31 16:57:29 +02:00
178eac6c98
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:12 +02:00
fca331cae9
NEWS
2014-03-31 16:57:02 +02:00
2c204a55af
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
...
On little endian:
map->p == php_magic_database
map->magic[i] = pointer into the map
map->p == NULL
map->magic[i] = pointer to allocated memory
On big endian (ppc64, s390x, ...):
map->p != php_magic_database and map->p != NULL
map->magic[i] = pointer into a copy of the map
Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
2014-03-31 16:50:47 +02:00
972c451c73
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update lib versions
Conflicts:
win32/build/libs_version.txt
2014-03-27 18:19:24 +01:00
1283722589
update lib versions
2014-03-27 18:18:06 +01:00
84cd0f9911
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-03-26 13:57:13 +02:00
89ea2650a1
Fix test
2014-03-26 13:56:58 +02:00
039cb10fa3
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-25 12:17:15 +00:00
170cf3ec00
- Updated to version 2014.2 (2014b)
2014-03-25 12:17:14 +00:00
8b7b67a21b
NEWS
2014-03-25 11:01:56 +01:00
84b0ab6d8f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
2014-03-25 11:01:20 +01:00
3616db6d38
NEWS
2014-03-25 11:00:47 +01:00
4374a52e9d
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 11:00:33 +01:00
1df558c6a0
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 10:58:50 +01:00
7477f5b387
fix disabling PGO for extensions, rel bug #65715
2014-03-25 06:44:54 +01:00
223f7d9a44
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
more fixes related to bug #65715
2014-03-24 19:18:39 +01:00
6612e1ba6a
more fixes related to bug #65715
2014-03-24 19:15:02 +01:00
8558640a6a
updated NEWS
2014-03-24 10:29:39 +01:00
76066b304c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:28:48 +01:00
5efda763be
updated NEWS
2014-03-24 10:28:21 +01:00
17a57ad980
Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:24:37 +01:00
41b4b84dda
Emit a warning in case of unallowed characters. Fix another place this
...
code is used - reuse
2014-03-20 16:23:40 +02:00
059bc99d94
don't replace with ?, just skip it
2014-03-20 12:11:16 +02:00
44fb74fad1
fix typo
2014-03-19 18:54:56 +02:00
d63ed101ee
Fix problem with mysqli_commt()/mysqli_rollback()
2014-03-19 18:32:19 +02:00
c4145619be
5.5.11RC1 preparation
2014-03-19 10:43:32 +01:00
1ff28cd0ec
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
prep for 5.4.27 rc1
Conflicts:
configure.in
main/php_version.h
2014-03-18 23:24:09 -07:00
9b88bc494e
prep for 5.4.27 rc1
2014-03-18 23:19:09 -07:00
2dfb8fbdf4
Merge branch 'PHP-5.4' into PHP-5.5
2014-03-18 14:48:56 +00:00
b30304fb78
- Updated to version 2014.1 (2014a)
2014-03-18 14:48:55 +00:00
2b811a5aec
Add a test
2014-03-18 15:42:38 +02:00
156cc39e21
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed off-by-one in php_url_parse_ex
2014-03-18 08:57:30 +01:00
497b918e62
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed off-by-one in php_url_parse_ex
Conflicts:
ext/standard/url.c
2014-03-18 08:54:57 +01:00
46566b78c9
Fixed off-by-one in php_url_parse_ex
...
Change order of condition, previously pointer could be derefrenced before
bound check was done.
2014-03-18 08:48:41 +01:00
66bf216c66
Fix bug #66873 : check if obj->src is set
2014-03-17 01:19:02 -07:00
80fa2ff646
NEWS
2014-03-14 09:52:37 +01:00
Michael Wallner