Daniel Lowrey
546a32e2b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
Conflicts:
ext/openssl/xp_ssl.c
2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
2014-08-25 17:28:09 +02:00
Lior Kaplan
6e87b01e95
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:29:05 +03:00
Ferenc Kovacs
86966a092b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
this test depends on the simplexml ext, not just on xml
2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
this test depends on the simplexml ext, not just on xml
2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1
this test depends on the simplexml ext, not just on xml
2014-08-24 00:08:09 +02:00
Tjerk Meesters
ce9bdae33f
Fixed #67694 : Regression in session_regenerate_id()
2014-08-23 09:18:02 +08:00
Michael Wallner
3b82c4e520
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #67865
updated NEWS to fit last release
NEWS
Fix bug #67878 program_prefix not honoured in man pages
2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #67865
2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37
fix bug #67865
2014-08-21 22:41:36 +02:00
Stanislav Malyshev
6da2a977fc
fix test
2014-08-20 14:44:25 -07:00
Stanislav Malyshev
2dfabd8b51
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d
fix test
2014-08-20 14:42:48 -07:00
Anatol Belski
20941b71aa
fixed variable corruption under win x64
2014-08-20 15:08:52 +02:00
Sara Golemon
a309dda777
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch use of strtok() to gd_strtok_r()
2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch use of strtok() to gd_strtok_r()
Conflicts:
NEWS
2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74
Switch use of strtok() to gd_strtok_r()
...
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.
I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
2014-08-19 13:16:44 -07:00
Stanislav Malyshev
fae17a00f5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:09 -07:00
Stanislav Malyshev
5a7039035c
5.4.32
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
iF4EABEIAAYFAlPzCaMACgkQL3lWvF2gS10pnwD9GYeG82QTI20oVqzQ4dVF+yks
xC5ph0RvUVXbJy8ADn4A/2Of7Q520LQYkxZHN0JDTb3EBaTvhG5sF6Yo1gTpJPKS
=NoE4
-----END PGP SIGNATURE-----
Merge tag 'PHP-5.4.32' into PHP-5.4
5.4.32
* tag 'PHP-5.4.32':
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
Conflicts:
configure.in
main/php_version.h
2014-08-19 01:33:45 -07:00
Remi Collet
230804b08d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
2014-08-19 08:41:14 +02:00
Remi Collet
5e9e0a2c74
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
2014-08-19 08:40:30 +02:00
Remi Collet
2fefae4771
Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
...
Incomplete fix for CVE-2014-4049
Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
2014-08-19 08:33:49 +02:00
Stanislav Malyshev
706aefb781
Fix bug #67730 - Null byte injection possible with imagexxx functions
2014-08-18 22:49:10 -07:00
Stanislav Malyshev
529da0f74c
Fixed bug #67717 - segfault in dns_get_record
2014-08-18 22:37:25 -07:00
Derick Rethans
77cc6aabb7
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-18 20:27:44 +01:00
Derick Rethans
36d05d75c8
Fixed bug #67109 : First uppercase letter breaks date string parsing.
2014-08-18 18:41:50 +01:00
Derick Rethans
2b9af967fb
Fixed bug #66985 : Some timezones are no longer valid in PHP 5.5.10.
2014-08-18 18:41:50 +01:00
Lior Kaplan
f1d0e50ea8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Correct typo in comments: 'initialized'
2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Correct typo in comments: 'initialized'
2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630
Correct typo in comments: 'initialized'
2014-08-17 21:32:53 +03:00
Lior Kaplan
56d02d564e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
Keyur Govande
032dee4982
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
2014-08-15 23:47:06 +00:00
Keyur Govande
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
2014-08-15 23:13:36 +00:00
Keyur Govande
7bfe9bf951
Merge branch 'pull-request/772' into PHP-5.4
...
* pull-request/772:
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
2014-08-15 23:06:55 +00:00
Remi Collet
7ba1409a1a
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:44:19 -07:00
Stanislav Malyshev
23122ba69c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:22:06 -07:00
Stanislav Malyshev
3468f03b6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:29 -07:00
Remi Collet
35f32637b0
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:20 -07:00
Remi Collet
49387b31cf
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:19:03 -07:00
Stanislav Malyshev
ff4cf1a838
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2014-08-14 17:07:45 -07:00
Stanislav Malyshev
eab42649ab
fix test
2014-08-14 17:07:28 -07:00
Stanislav Malyshev
008330e5b3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
split the glob() test to test different basedir
2014-08-14 17:05:03 -07:00
Anatol Belski
b7cd099ae0
split the glob() test to test different basedir
2014-08-14 17:04:51 -07:00
Stanislav Malyshev
4185633207
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358 , glob returns error, should be empty array()
2014-08-14 17:00:36 -07:00