Anatol Belski
acea91b18c
Fixes to unified stdint usage
...
This recalls 14caf174ff
2013-08-12 13:39:17 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Derick Rethans
06cef326fd
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f
- Updated to version 2013.4 (2013d)
2013-07-09 09:07:16 +01:00
David Soria Parra
b86c85723e
Fix #64711 ("value computed but not used" in parse_date.c)
2013-04-26 11:33:54 +02:00
Derick Rethans
0b2c411323
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50
- Updated to version 2013.3 (2013c)
2013-04-22 17:51:41 +01:00
Derick Rethans
0720804e7c
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-22 17:51:47 +01:00
EC2 Default User
b07ecb5501
Bug #60774 (DateInterval::format("%a") is always zero when an interval is
...
created using the createFromDateString method)
2013-03-31 10:59:21 +01:00
Derick Rethans
84208d9dc5
Added the new .c files as well as they are not automatically regenerated.
2013-03-31 10:55:45 +01:00
Lonny Kapelushnik
58a8013e5f
Rebased to PHP-5.4
...
Implemented Dmitrys change from df97c3aa0d
Moved the timelib_parse_tz_cor function to ext/date/lib/timelib.c
2013-03-31 10:45:01 +01:00
Lonny Kapelushnik
a4ca01cc2b
Made separate tests for each TZ type
...
Fixed handling of unserializing types 1 and 3
2013-03-31 10:45:00 +01:00
Derick Rethans
e5c64c0bda
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-11 21:36:41 +00:00
Derick Rethans
98bb5f4798
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503
- Updated to version 2013.2 (2013b)
2013-03-11 21:36:36 +00:00
Derick Rethans
c596850af6
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-03-03 12:58:42 -05:00
Derick Rethans
a3f020a4be
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5
- Updated to version 2013.1 (2013a)
2013-03-03 12:53:22 -05:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
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
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
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
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
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
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
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
00fc59e0ca
Merge branch 'master' of git.php.net:/php-src
2012-08-24 10:54:48 +02:00