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
5a7039035c
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
eb2360602e
5.4.32
2014-08-19 00:40:27 -07:00
335d89ec4d
NEWS
2014-08-19 08:40:58 +02:00
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
88c48a4b95
NEWS
2014-08-19 08:40:18 +02:00
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
2b10db8e10
fix potentially missing NUL termination
2014-08-18 23:04:24 -07:00
706aefb781
Fix bug #67730 - Null byte injection possible with imagexxx functions
2014-08-18 22:49:10 -07:00
529da0f74c
Fixed bug #67717 - segfault in dns_get_record
2014-08-18 22:37:25 -07:00
299d8f339f
Merge branch 'datetimebugs' into PHP-5.5
2014-08-18 20:27:33 +01:00
05d1612e16
BFN.
2014-08-18 18:46:56 +01:00
36d05d75c8
Fixed bug #67109 : First uppercase letter breaks date string parsing.
2014-08-18 18:41:50 +01:00
2b9af967fb
Fixed bug #66985 : Some timezones are no longer valid in PHP 5.5.10.
2014-08-18 18:41:50 +01:00
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
1504f7d630
Correct typo in comments: 'initialized'
2014-08-17 21:32:53 +03:00
be2128c805
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typofixes
2014-08-17 15:48:22 +03:00
3f42f2f5d1
typofixes
2014-08-17 15:44:02 +03:00
6279246d2c
Update NEWS
2014-08-15 23:38:14 +00:00
48dc203408
Fix another failing test
2014-08-15 23:26:21 +00:00
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
0407bdf252
Add NEWS
2014-08-15 23:08:29 +00:00
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
7ba1409a1a
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:44:19 -07:00
59c2477bc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:37 -07:00
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
35f32637b0
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:21:20 -07:00
49387b31cf
Fix bug #67716 - Segfault in cdf.c
2014-08-14 17:19:03 -07:00
ff4cf1a838
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2014-08-14 17:07:45 -07:00
eab42649ab
fix test
2014-08-14 17:07:28 -07:00
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
b7cd099ae0
split the glob() test to test different basedir
2014-08-14 17:04:51 -07:00
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
ad492ca932
fixed glob() edge case on windows, ref bug #47358
2014-08-14 16:58:16 -07:00
481c4715d4
- fix bug #47358 , glob returns error, should be empty array()
...
Conflicts:
ext/standard/dir.c
2014-08-14 16:56:22 -07:00
4e2c01617f
Fix failing tests
2014-08-14 18:20:26 +00:00
c044164a96
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-14 18:19:56 +00:00
d1dd71454d
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-14 17:22:25 +02:00
aeb633543b
Merge branch 'PHP-5.3' into PHP-5.4
2014-08-14 17:13:44 +02:00
7311087cf0
Update Git rules
2014-08-14 17:08:02 +02:00
1355ea60cc
Back to -dev (with EOL notice in NEWS)
2014-08-14 17:05:20 +02:00
babeca356b
It's 2014 already, fix copyright year where user visible
...
Left out all file headers
2014-08-13 21:22:50 +02:00
1847cf10c1
PHP 5.3.29
2014-08-13 18:36:10 +02:00
7fbc99e390
Some changes were lost in the merge commit of #66091
2014-08-13 20:57:10 +08:00
e4905b38b7
Updated NEWS for #66091
2014-08-13 20:24:43 +08:00
4b85f1d46a
Fixed #66091
2014-08-13 20:24:43 +08:00
f6896e4395
Fixed #66091
2014-08-13 20:12:42 +08:00
de18f42047
updated NEWS
2014-08-12 11:51:42 +02:00
934c35f586
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
backported the fix for bug #41577
2014-08-12 11:50:55 +02:00
8c247af1fc
updated NEWS
2014-08-12 11:50:26 +02:00
Stanislav Malyshev