clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,828 Commits 494 Branches 1,367 Tags 810 MiB
9e86fa301f
Commit Graph

1026 Commits

Author SHA1 Message Date
Derick Rethans
4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Derick Rethans
51fe5bcd09 Merge branch 'PHP-5.4' 2012-10-18 21:53:08 +01:00
Derick Rethans
4980b24025 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029 - Updated to version 2012.7 (2012g) 2012-10-18 21:53:03 +01:00
Anatoliy Belsky
674ccefc2d Fix warnings preventing this test from passing 2012-10-10 11:01:07 +02:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Derick Rethans
b004a04f0a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-10-04 08:39:34 +01:00
Derick Rethans
34eb787828 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-10-04 08:39:21 +01:00
Stanislav Malyshev
40bb9254c5 Merge branch 'pull-request/210' into PHP-5.4 
* pull-request/210:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
 2012-09-30 20:19:36 -07:00
Lonny Kapelushnik
b3469560f3 Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) 
Prevent a unix timestamp, which is always GMT when being parsed, from taking on
the local timezones DST flag.
 2012-09-30 04:31:29 +00:00
Anatoliy Belsky
e70aed5c74 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix warnings preventing this test from passing
 2012-10-10 11:06:34 +02:00
Xinchen Hui
b17039c737 Remove executable permission on phpt 2012-10-10 10:32:58 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Derick Rethans
61bee020e1 Merge branch 'master' of git.php.net:/php-src 2012-10-04 08:38:56 +01:00
Stanislav Malyshev
e3e3fba66d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
 2012-09-30 20:21:11 -07:00
Stanislav Malyshev
44e3a9be7e Merge branch 'PHP-5.4' 
* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail
 2012-09-17 15:58:48 -07:00
Xinchen Hui
6096988704 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-17 11:21:14 +08:00
Xinchen Hui
eb881a1dd1 test should fail 2012-09-17 11:20:24 +08:00
Xinchen Hui
d23f9194b1 Merge branch 'PHP-5.4' 2012-09-15 11:33:26 +08:00
Xinchen Hui
2eff69f402 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-15 11:32:08 +08:00
Xinchen Hui
1b13ff6ec7 Add XFAIL test for bug #62852 2012-09-15 11:29:47 +08:00
Xinchen Hui
e766f85405 Revert "Fixed bug #62852 (Unserialize invalid DateTime causes crash)" 
see: http://news.php.net/php.bugs/173451

This reverts commit 46a3f25772.
 2012-09-15 11:26:21 +08:00
Derick Rethans
7101e9161c Merge branch 'PHP-5.4' 2012-09-14 09:38:36 +01:00
Derick Rethans
ab62ffa0a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-14 09:38:32 +01:00
Derick Rethans
78354f30d9 - Updated to version 2012.6 (2012f) 2012-09-14 09:38:31 +01:00
Xinchen Hui
f6000a01e2 Capitalize the warning message 2012-09-11 18:09:47 +08:00
Xinchen Hui
79e6635cb6 Rearrange the codes, remove empty lines 2012-09-11 18:02:19 +08:00
Xinchen Hui
0146efbd41 Merge branch 'invalid-timezone' of https://github.com/simonwelsh/php-src 2012-09-11 17:58:20 +08:00
Simon Welsh
e06c47ca2a Provide a specific error message if date.timezone value is invalid. 2012-09-11 21:45:09 +12:00
Xinchen Hui
94582f9398 year++ 
missed the .re files in 5.3
 2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f Merge branch 'PHP-5.4' 2012-09-05 23:44:41 +08:00
Xinchen Hui
a3d078bd8f correct PHP version & year++ 2012-09-05 23:43:59 +08:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Derick Rethans
bc602495d7 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-08-24 10:56:03 +02:00
Derick Rethans
e5bfcd340a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-08-24 10:55:17 +02:00
Derick Rethans
00fc59e0ca Merge branch 'master' of git.php.net:/php-src 2012-08-24 10:54:48 +02:00
Xinchen Hui
ca3c210f05 Merge branch 'PHP-5.4' 2012-08-19 18:34:17 +08:00
Xinchen Hui
8693bae624 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-19 18:33:37 +08:00
Reeze Xia
46a3f25772 Fixed bug #62852 (Unserialize invalid DateTime causes crash) 2012-08-19 17:57:45 +08:00
Derick Rethans
68ecccc60b Merge branch 'PHP-5.4' 2012-08-06 12:59:44 +01:00
Derick Rethans
de59314a60 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-06 12:59:39 +01:00
Derick Rethans
0a2833bbef - Updated to version 2012.5 (2012e) 2012-08-06 12:59:38 +01:00
Dmitri Iouchtchenko
a6a7787cf2 Fix #61642: modify("+5 weekdays") returns Sunday 
Adding a non-zero multiple of 5 weekdays to any Friday, Saturday, or
Sunday would result in a Sunday instead of the correct date. This patch
provides an implementation of do_adjust_special_weekday() which does
not suffer from this issue.
 2012-08-05 19:22:36 -07:00
Derick Rethans
7e2442038c Merge branch 'PHP-5.4' 2012-07-20 10:07:33 +01:00
Derick Rethans
ceee821d73 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-20 10:07:24 +01:00
Derick Rethans
d621a91a50 - Updated to version 2012.4 (2012d) 2012-07-20 10:07:23 +01:00
Xinchen Hui
bcf5853eaa Fixed Bug #62500 (Segfault in DateInterval class when extended) 2012-07-10 18:43:11 +08:00
Xinchen Hui
96651f8094 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed Bug #62500 (Segfault in DateInterval class when extended)
 2012-07-09 00:28:04 +08:00
Xinchen Hui
e3b9b1e6dc Fixed Bug #62500 (Segfault in DateInterval class when extended) 
This fix also fixed bug #62508  (Segfault while access a non-string
property of DateInterval object)
 2012-07-09 00:25:48 +08:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
Anatoliy Belsky
c9d89a349b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bug 61610 adopted expected warnings for 5.4
 2012-04-24 13:45:07 +02:00
Anatoliy Belsky
c7f9f54a23 Bug 61610 adopted expected warnings for 5.4 2012-04-24 13:36:43 +02:00
Anatoliy Belsky
e33d209076 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
  MFH: fixed a mistake on reverting my previous patch.
 2012-04-10 12:38:19 +02:00
Anatoliy Belsky
31a3e83190 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
 2012-04-10 12:37:37 +02:00
Anatoliy Belsky
26dbc5ecb4 Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails 
The behaviour on windows is to select an arbitrary timezone from the
current system settings. This gives no chance to hardcode the timezone
name, for instance for UTC+1 it could choose from the multiple names
like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made
for windows. Tested on debian and win7 both x86.
 2012-04-10 12:33:11 +02:00
Anatoliy Belsky
fbbad87056 Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails 
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made for windows.
 2012-04-10 12:20:40 +02:00
Anatoliy Belsky
fd68d5b139 Fix bug #61609 Test ext\date\tests\bug52062.phpt fails 
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
 2012-04-10 12:20:40 +02:00
Anatoliy Belsky
aa6ad6bc09 Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails 
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made for windows.
 2012-04-10 12:16:38 +02:00
Anatoliy Belsky
7a2a75d057 Fix bug #61609 Test ext\date\tests\bug52062.phpt fails 
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
 2012-04-10 12:16:38 +02:00
Anatoliy Belsky
d89b65f985 Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails 
The behaviour on windows is to select an arbitrary timezone from the current system settings.
This gives no chance to hardcode the timezone name, for instance for UTC+1 it could choose
from the multiple names like Europe/Berlin or Europe/Paris . For this reason the test is
parametrized so there is no hardcoded timezone data.

The original test made to be skipped on windows and a duplicate was made for windows.
 2012-04-10 11:03:41 +02:00
Anatoliy Belsky
4ff55e646a Fix bug #61609 Test ext\date\tests\bug52062.phpt fails 
As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php
this is the generic 32 bit timestamp issue
 2012-04-10 10:18:10 +02:00
Derick Rethans
cecc37b467 Merge branch 'PHP-5.4' 2012-04-02 10:40:03 +01:00
Derick Rethans
6c6bec5760 Merge branch 'PHP-5.3' into PHP-5.4 2012-04-02 10:40:02 +01:00
Derick Rethans
0e53ac49e6 - Updated to version 2012.3 (2012c) 2012-04-02 10:40:01 +01:00
Rasmus Lerdorf
950e6b3ea3 Missed 5.3 for the Armenia DST drop 2012-03-02 17:08:00 +00:00
Rasmus Lerdorf
c9eaa52fd0 Armenia is smarter than the rest of us. They have dropped DST. 
http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
Fix the test to reflect that.
 2012-03-02 17:03:19 +00:00
Rasmus Lerdorf
df55241915 Armenia is smarter than the rest of us. They have dropped DST. 
http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
Fix the test to reflect that.
 2012-03-02 17:03:19 +00:00
Derick Rethans
282d601338 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
55166a0684 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
cab11b7418 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
c932ada103 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Derick Rethans
1476b02ca1 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Derick Rethans
f851caa6d6 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Stanislav Malyshev
951940668d move to XFAIL since it fails on 32-bit 2012-01-04 20:40:13 +00:00
Stanislav Malyshev
a1ec2aab1b move to XFAIL since it fails on 32-bit 2012-01-04 20:40:13 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Daniel Convissor
467ed9255b Resolve the last of the xfails from Bug 55253. 2011-12-28 01:13:12 +00:00
Daniel Convissor
c49b8515df Resolve the last of the xfails from Bug 55253. 2011-12-28 01:13:12 +00:00
Daniel Convissor
44851f4146 Resolve the last of the xfails from Bug 55253. 2011-12-28 01:13:12 +00:00
Daniel Convissor
7dc52a6b43 Resolve more xfails due to Bug 55253 being fixed. 2011-12-27 19:44:13 +00:00
Daniel Convissor
defc87db2c Resolve more xfails due to Bug 55253 being fixed. 2011-12-27 19:44:13 +00:00
Daniel Convissor
16332c7ba2 Resolve more xfails due to Bug 55253 being fixed. 2011-12-27 19:44:13 +00:00
Daniel Convissor
5b3551e4e3 Resolve some xfails due to Bug 55253 being fixed. (merged from 54) 2011-12-27 16:57:36 +00:00
Daniel Convissor
feabf2cfda Resolve some xfails due to Bug 55253 being fixed. (merged from 54) 2011-12-27 16:57:36 +00:00
Daniel Convissor
7ea4e8266c Another xfail resolved since Bug 55253 was fixed. 2011-12-27 16:50:16 +00:00
Daniel Convissor
4a59413e48 Another xfail resolved since Bug 55253 was fixed. 2011-12-27 15:20:16 +00:00
Daniel Convissor
448ed9bc83 One less xfail since Bug 55253 was fixed. 2011-12-27 02:13:55 +00:00
Derick Rethans
9cbf9472b6 This test should no longer fail, and is perfectly okay for Linux to test on too. 2011-12-12 12:57:46 +00:00
Derick Rethans
31afa034f0 This test should no longer fail, and is perfectly okay for Linux to test on too. 2011-12-12 12:57:46 +00:00
Derick Rethans
1d7ed3f0dc This test should no longer fail, and is perfectly okay for Linux to test on too. 2011-12-12 12:57:46 +00:00
Derick Rethans
109cc0bfab Test cosmetics. 2011-12-07 19:42:44 +00:00
Derick Rethans
96f55bb628 Test cosmetics. 2011-12-07 19:42:44 +00:00
Derick Rethans
38eecffe0d Test cosmetics. 2011-12-07 19:42:44 +00:00
Derick Rethans
60d195dc44 Sorting out the tests *once* more. 
Please keep them consistent and only change them if you are 110% certain what
you're doing. Otherwise -> please ask.
 2011-12-07 19:24:58 +00:00