clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,370 Commits 491 Branches 1,363 Tags 846 MiB
eab14993fe
Commit Graph

991 Commits

Author SHA1 Message Date
Sebastian Bergmann
eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Dmitry Stogov
bc7857169a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use get_gc instead of hacks of get_properties
 2012-12-05 17:59:46 +04:00
Dmitry Stogov
df97c3aa0d Use get_gc instead of hacks of get_properties 2012-12-05 17:58:36 +04:00
Stanislav Malyshev
1c8f106d9a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #63666 - Poor date() performance
 2012-12-04 21:02:55 -08:00
Stanislav Malyshev
fd650ec93e fix bug #63666 - Poor date() performance 2012-12-04 21:02:09 -08:00
Remi Collet
50fec2bae2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:26:32 +01:00
Remi Collet
92a5e4def0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:24:02 +01:00
Remi Collet
c2554b4bb4 Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond 
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'

Already known per bug45554 reproducer (also fixed).
 2012-12-01 10:20:39 +01:00
Derick Rethans
dae05b2973 Merge branch 'PHP-5.4' 2012-11-13 10:17:21 +00:00
Derick Rethans
4f36aeb120 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-11-13 10:16:58 +00:00
Derick Rethans
00ad4c0e6a - Updated to version 2012.10 (2012j) 2012-11-13 10:15:34 +00:00
Derick Rethans
37cc133d6f Merge branch 'PHP-5.4' 2012-11-04 16:24:07 +00:00
Derick Rethans
db0f623490 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-04 16:24:02 +00:00
Derick Rethans
1784279be0 - Updated to version 2012.9 (2012i) 2012-11-04 16:23:58 +00:00
Derick Rethans
c511ee3d64 Merge branch 'PHP-5.4' 2012-10-27 15:19:59 +01:00
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