Martin Jansen
de31324c22
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
...
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
2015-02-01 00:08:35 -08:00
Stanislav Malyshev
e5e251b023
fix group name handling
2015-01-31 23:47:03 -08:00
Stanislav Malyshev
d82424b46f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TSRM
2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78
fix TSRM
2015-01-31 23:34:14 -08:00
Stanislav Malyshev
380741daa4
add NEWS
2015-01-31 23:19:23 -08:00
Danack
dbc0a80b23
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:13:55 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Yasuo Ohgaki
c8a12508c7
Fixed typo in comment
2015-02-01 05:14:27 +09:00
Yasuo Ohgaki
d463ddd3c7
Use bash rather than sh
2015-01-29 15:21:17 +09:00
Yasuo Ohgaki
abf9e2ea09
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:25:28 +09:00
Xinchen Hui
b2cf3f064b
Fixed bug #68901 (use after free)
2015-01-29 00:00:09 +08:00
Xinchen Hui
4c5995b172
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
2015-01-27 22:25:38 +08:00
Xinchen Hui
c3ff9aa17d
Revert previous unintentional change to this
2015-01-27 22:19:11 +08:00
Xinchen Hui
8c2d91761a
Also Fixed #68571 in CGI SAPI, and some cleanup
2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
2015-01-27 22:04:23 +08:00
Bob Weinand
3f57663b57
Add NEWS entry
2015-01-26 22:50:16 +01:00
Bob Weinand
b8461eb9ac
Fix call after close if multiple filters are attached
2015-01-26 22:47:35 +01:00
Keyur Govande
d065a2fc1b
Add NEWS
2015-01-26 21:29:57 +00:00
Keyur Govande
1933b556b9
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
...
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
2015-01-26 21:19:00 +00:00
Ferenc Kovacs
f014785eeb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix some factual errors in the process
2015-01-22 21:28:21 +01:00
Ferenc Kovacs
61ad5e24ea
fix some factual errors in the process
2015-01-22 21:27:38 +01:00
Remi Collet
2955993947
move CVE to the right version
2015-01-22 13:06:15 +01:00
Anatol Belski
43652d386a
simplify error handling for dirs as magic
2015-01-22 10:16:13 +01:00
Joshua Rogers
91aa340180
Fixed bug #68827 Double free with disabled ZMM
2015-01-22 09:59:13 +01:00
Xinchen Hui
251745c012
Fixed segfault while running with moodle
2015-01-22 16:38:34 +08:00
Julien Pauli
88f2321a25
Updated NEWS
2015-01-21 11:10:20 +01:00
Xinchen Hui
20e5911d82
Fixed test fails
2015-01-21 11:17:49 +08:00
Derick Rethans
8e19705a93
Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)
2015-01-20 21:44:19 +00:00
Stanislav Malyshev
cca3c8a985
fix year
2015-01-20 13:27:38 -08:00
Stanislav Malyshev
53b3db43ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
format
2015-01-20 11:57:50 -08:00
Stanislav Malyshev
04dcc705de
update NEWS
2015-01-20 11:57:39 -08:00
Stanislav Malyshev
b3b155ffe2
format
2015-01-20 11:57:17 -08:00
Stanislav Malyshev
295b42b76e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
2015-01-20 11:55:04 -08:00
Stanislav Malyshev
547f62ed2a
add CVE
2015-01-20 11:54:45 -08:00
Stanislav Malyshev
a3cb69d63e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add protection against nulls
2015-01-20 11:46:39 -08:00
Stanislav Malyshev
ef4896d956
add protection against nulls
2015-01-20 11:46:10 -08:00
Stanislav Malyshev
e2744c51b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.38 next
Fix bug #68799 : Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
configure.in
main/php_version.h
2015-01-20 10:40:11 -08:00
Stanislav Malyshev
8825311ce1
5.4.38 next
2015-01-20 10:38:33 -08:00
Julien Pauli
a40e004553
Updated NEWS
2015-01-20 15:09:13 +01:00
Joshua Rogers
df67c4e8bd
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 14:54:48 +01:00
Stanislav Malyshev
e63f7b47e1
Merge branch 'bug68710' into PHP-5.4
...
* bug68710:
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-20 01:02:26 -08:00
Stanislav Malyshev
fc6aa939f5
Merge branch 'bug68799' into PHP-5.4
...
* bug68799:
Fix bug #68799 : Free called on unitialized pointer
2015-01-20 01:00:11 -08:00
Derick Rethans
b0159431e3
Fixed bug #45081 (strtotime incorrectly interprets SGT time zone).
2015-01-19 22:59:24 +00:00
Xinchen Hui
fa3808bacc
Update year
2015-01-17 13:21:20 +08:00