manuel
3550cc5fd9
add tests for #68996
2015-02-07 18:52:26 +01:00
Anatol Belski
63761ab91e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Removed erroneous condition
2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b
Removed erroneous condition
...
This condition is always false. Furthermore headers_list() is
documented to always return an array.
2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08
fix tests
2015-02-05 21:54:47 -08:00
Stanislav Malyshev
a1c28567c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update header handling to RFC 7230
2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update header handling to RFC 7230
2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073
Update header handling to RFC 7230
2015-02-05 20:08:12 -08:00
Stanislav Malyshev
d33f4c6eb8
fix test to not hit php.net
2015-02-05 00:41:51 -08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Daniel Lowrey
f86600c167
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/standard/file.c
2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96
Fixed bug #65272 : correctly set flock() out param in windows
2015-02-02 10:47:54 -05:00
Stanislav Malyshev
55d5811f85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TSRM
2015-01-31 23:34:44 -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
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -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
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -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
Bob Weinand
666cb333f7
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
2015-01-26 22:51:37 +01:00
Bob Weinand
b8461eb9ac
Fix call after close if multiple filters are attached
2015-01-26 22:47:35 +01:00
Keyur Govande
4c6918ec17
Patch commit d9f85373e3
by moving the float_to_double function to
...
a header file.
2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599
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:20:29 +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
Stanislav Malyshev
e18ec95687
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
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:
ext/standard/var_unserializer.c
2015-01-20 10:40:39 -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
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Adam Harvey
16b6f6c7f4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Calling crypt() with a salt of *0 should always return *1.
5.5.22 now
Conflicts:
configure.in
main/php_version.h
2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761
Calling crypt() with a salt of *0 should always return *1.
2015-01-08 19:13:23 +00:00
Anatol Belski
4756207e7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix ACLs tests, make it create dir where it has to, not file
2015-01-05 19:20:07 +01:00
Anatol Belski
339139f876
fix ACLs tests, make it create dir where it has to, not file
2015-01-05 19:19:24 +01:00
Stanislav Malyshev
b585a3aed7
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
2015-01-01 16:19:05 -08:00
Stanislav Malyshev
681a1afd3f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Conflicts:
ext/standard/var_unserializer.c
2014-12-16 10:19:32 -08:00
Stanislav Malyshev
622a346302
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:17:07 -08:00
Stanislav Malyshev
630f9c33c2
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:15:17 -08:00
Andrea Faulds
51771ed238
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-13 22:30:19 +00:00
Andrea Faulds
f804a3614e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
2014-12-13 22:28:45 +00:00
Andrea Faulds
034e6decb3
Fix undefined behaviour in strnatcmp
2014-12-13 22:27:10 +00:00
Julien Pauli
a0d848f795
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:50:42 +01:00
mcq8
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
Anatol Belski
0323f66fa2
move the test to the right place
2014-12-11 10:39:47 -08:00
Anatol Belski
13f1c276ab
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-11 10:39:37 -08:00
Anatol Belski
21da246807
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move the test to the right place
2014-12-10 13:22:52 +01:00
Anatol Belski
c5f7dcd1dc
move the test to the right place
2014-12-10 13:19:51 +01:00
Anatol Belski
4a82cdce66
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
2014-12-10 11:47:34 +01:00
Anatol Belski
20d93534d5
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-10 11:43:33 +01:00