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
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
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
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
7fbc99e390
Some changes were lost in the merge commit of #66091
2014-08-13 20:57:10 +08:00
4b85f1d46a
Fixed #66091
2014-08-13 20:24:43 +08:00
f6896e4395
Fixed #66091
2014-08-13 20:12:42 +08: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
daa1fb8ba6
backported the fix for bug #41577
2014-08-12 11:49:46 +02:00
7aa776c7b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:37:44 +02:00
39dd715382
fix the failing date tests introduced with the latest timezonedb update
...
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
2014-08-12 10:34:54 +02:00
b6ddcf9c71
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
2014-08-11 17:46:56 +08:00
d4df6d0200
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2014-08-11 17:44:42 +08:00
75991561d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2014-08-07 19:50:25 +02:00
84a4041ba4
fix TS build
2014-08-07 19:49:59 +02:00
5ac2e5f850
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #41631 : Observe socket read timeouts in SSL streams
2014-08-07 11:51:42 -04:00
6569db8808
Bug #41631 : Observe socket read timeouts in SSL streams
2014-08-07 11:47:42 -04:00
0753c22e76
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-07 10:22:10 +01:00
7df4087b98
- Updated to version 2014.6 (2014f)
2014-08-07 10:22:09 +01:00
ce5efa7adc
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-06 15:28:06 +03:00
41e1ccefd5
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
configure.in
main/php_version.h
2014-08-06 15:27:56 +03:00
d72b943262
Add EXPECTF
2014-08-06 15:27:29 +03:00
9444bc7997
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-08-06 14:52:55 +03:00
547451796c
Fix handling of multi-result sets with PS...used to clean not only
...
the result set but the whole PS.
2014-08-06 14:52:12 +03:00
e4ff7f2ee3
Fixed Bug #67724
...
(chained zlib filters silently fail with large amounts of data)
Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data
2014-08-05 15:44:43 +02:00
cf4753691d
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
...
Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704
Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
2014-08-04 10:42:39 +02:00
ae74549239
backport the fix for bug #67739
2014-08-04 09:57:08 +02:00
61ec9b5b0f
add test
2014-08-04 00:08:08 -07:00
eeaec70758
Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 00:05:40 -07:00
95febf26c6
Fix wrong lenght size
2014-07-31 21:27:51 +03:00
c2f2d5c8fc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
2014-07-31 14:33:55 +01:00
358aedc454
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:21:38 +01:00
579c9066a0
Merge commit '8b9719d' into PHP-5.5
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:24 -04:00
Derick Rethans