php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 22:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,125 Commits 547 Branches 1,481 Tags
299d8f339fe6830d2955a4cdeb268f749694aedb
Commit Graph

76125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans
299d8f339f Merge branch 'datetimebugs' into PHP-5.5 2014-08-18 20:27:33 +01:00
Derick Rethans
05d1612e16 BFN. 2014-08-18 18:46:56 +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
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
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
6279246d2c Update NEWS 2014-08-15 23:38:14 +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
0407bdf252 Add NEWS 2014-08-15 23:08:29 +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
Stanislav Malyshev
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
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
Anatol Belski
ad492ca932 fixed glob() edge case on windows, ref bug #47358 2014-08-14 16:58:16 -07:00
Pierre Joye
481c4715d4 - fix bug #47358, glob returns error, should be empty array() 
Conflicts:
	ext/standard/dir.c
 2014-08-14 16:56:22 -07:00
Keyur Govande
4e2c01617f Fix failing tests 2014-08-14 18:20:26 +00:00
Keyur Govande
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
Johannes Schlüter
d1dd71454d Merge branch 'PHP-5.4' into PHP-5.5 2014-08-14 17:22:25 +02:00
Johannes Schlüter
aeb633543b Merge branch 'PHP-5.3' into PHP-5.4 2014-08-14 17:13:44 +02:00
Johannes Schlüter
7311087cf0 Update Git rules 2014-08-14 17:08:02 +02:00
Johannes Schlüter
1355ea60cc Back to -dev (with EOL notice in NEWS) 2014-08-14 17:05:20 +02:00
Johannes Schlüter
babeca356b It's 2014 already, fix copyright year where user visible 
Left out all file headers
php-5.3.29 		2014-08-13 21:22:50 +02:00
Johannes Schlüter
1847cf10c1 PHP 5.3.29 2014-08-13 18:36:10 +02:00
Tjerk Meesters
7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters
e4905b38b7 Updated NEWS for #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters
f6896e4395 Fixed #66091 2014-08-13 20:12:42 +08:00
Anatol Belski
de18f42047 updated NEWS 2014-08-12 11:51:42 +02:00
Anatol Belski
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
Anatol Belski
8c247af1fc updated NEWS 2014-08-12 11:50:26 +02:00
Anatol Belski
daa1fb8ba6 backported the fix for bug #41577 2014-08-12 11:49:46 +02:00
Ferenc Kovacs
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
Ferenc Kovacs
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
Xinchen Hui
b6ddcf9c71 Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) 2014-08-11 17:46:56 +08:00
Xinchen Hui
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
Anatol Belski
75991561d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TS build
 2014-08-07 19:50:25 +02:00
Anatol Belski
84a4041ba4 fix TS build 2014-08-07 19:49:59 +02:00
Daniel Lowrey
a04c5536bb Update NEWS 2014-08-07 12:39:42 -04:00
Daniel Lowrey
378ffd3cdf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-08-07 12:38:04 -04:00
Daniel Lowrey
1ff30fd88c Update NEWS 2014-08-07 12:37:50 -04:00
Daniel Lowrey
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