1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

73 Commits

Author SHA1 Message Date
Derick Rethans 3ddd826684 Tell timelib we support v2 2015-08-13 10:50:28 +01:00
Derick Rethans 66c7eea659 Merge branch 'PHP-5.5' 2015-04-29 00:28:04 +01:00
Derick Rethans df49ce3d5a This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync 2015-04-29 00:25:29 +01:00
Derick Rethans f179852f83 Merge branch 'PHP-5.6'
Conflicts:
	ext/date/lib/parse_tz.c
2015-04-29 00:10:40 +01:00
Derick Rethans 912e42fc23 Split header reading in 32bit and 64bit variants.
We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.
2015-04-29 00:08:28 +01:00
Derick Rethans cdd2b8a79f Merge whitespace changes that have been made to timelib and PHP-5.6 and master 2015-04-28 15:57:26 +01:00
Matteo Beccati 4cabbf9781 Revert "Fix segfault in ext/date since 957aa2"
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
2015-04-28 12:56:11 +02:00
Matteo Beccati 7778a5a9b4 Revert "Fix segfault in ext/date since 957aa2"
This reverts commit b5e5098c50.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)
2015-04-28 12:56:05 +02:00
Matteo Beccati 94f0b940f9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix segfault in ext/date since 957aa2
2015-04-28 11:08:46 +02:00
Matteo Beccati df490dcf0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix segfault in ext/date since 957aa2
2015-04-28 10:57:52 +02:00
Matteo Beccati b5e5098c50 Fix segfault in ext/date since 957aa2 2015-04-28 10:57:18 +02:00
Derick Rethans 1a4d3e4855 Merge branch 'PHP-5.6' 2015-04-26 11:04:54 +01:00
Derick Rethans 1e18ffd2f8 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-26 11:04:35 +01:00
Derick Rethans 957aa220aa Fixed location reading due to file format changes 2015-04-26 11:04:16 +01:00
Xinchen Hui fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Veres Lajos 06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
2014-11-23 14:33:43 -08:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski c49cd84da9 make timelib independent from zend_long 2014-08-26 09:27:55 +02:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Johannes Schlüter 38c1181cfa - Fix a few more memleaks found by parfait 2011-05-16 21:29:45 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Nuno Lopes f30aaa1d6d fix strict aliasing problems.
this should fix the crash that Sebastian was having with gcc 4.4. Please confirm this is the case
2009-04-25 16:33:41 +00:00
Sebastian Bergmann 08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Antony Dovgal 3b7051bea2 MFH: do not fail & segfault if malloc(0) returns NULL, that's expected 2008-08-09 22:01:08 +00:00
Derick Rethans 84693147d0 - MFH: Added support for selectively listing timezone identifiers by country
code through timezone_identifiers_list() / DateTimezone::listIdentifiers().
- MFH: Added timezone_location_get() / DateTimezone::getLocation() for
  retrieving location information from timezones.
2008-07-18 14:33:53 +00:00
Derick Rethans e22155e848 - MFH: Fixing returned offset.
- MFH: Algorithm optimization.
2008-04-07 17:44:03 +00:00
Sebastian Bergmann d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal 2198abb1c4 MFH: detect endianness in compile time when using Apple's GCC (fixes universal binary build) 2007-09-04 18:46:21 +00:00
Antony Dovgal 40ca697a67 add missing ifdefs 2007-01-25 14:38:45 +00:00
Antony Dovgal 4cb734b05f setlocale() returns static buffer, which must be copied 2007-01-25 13:37:04 +00:00
Ilia Alshanetsky 6f98a771e6 Fixed bug #39993 (tr_TR.UTF-8 locale has problems with PHP). 2007-01-18 23:20:24 +00:00
Sebastian Bergmann 4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Nuno Lopes 94404da606 fix the bug I introduced previously, sorry
anyway, convert the recursive version of the binary search to an iterative one
2006-11-10 23:27:11 +00:00
Nuno Lopes fe8e53f7a7 mark the binary search delimiters as unsigned, so that the compiler can use a quick shift operation 2006-11-10 17:32:15 +00:00
Nuno Lopes 0f6f089698 omg. take #2 to fix the bug. sorry.. 2006-09-01 23:25:29 +00:00
Nuno Lopes c8b2f761f6 fix possible crash 2006-09-01 23:13:20 +00:00
Antony Dovgal 5e93a7df9a eliminate compile warnings 2006-07-11 12:37:00 +00:00
Nuno Lopes 29b0798cc8 revert per Derick request 2006-06-27 21:00:03 +00:00
Nuno Lopes 5c97837ca2 add a couple of static and const keywords, to let the compiler optimize better
will MFB in a hour, or so
2006-06-27 19:48:01 +00:00
Derick Rethans 74dfa9f0ba MFH:
- Implemented Dmitry's const patch.
- Added support for "weekday" as relative item.
- Fixed bug #37368 (Incorrect timestamp returned for strtotime()).
2006-05-14 17:36:05 +00:00
Antony Dovgal 91f4b380d6 fix several leaks in date_sun*() functions 2006-03-18 23:43:48 +00:00
Derick Rethans 88268c6bcc - MFH: Fixed bug #35887 (wddx_deserialize not parsing dateTime fields properly).
- MFH: Fixed bug #35885 (strtotime("NOW") no longer works).
- MFH: Fixed bug #33789 (Many Problems with SunFuncs).
- MFH: Fixed bug #33671 (sun_rise and sun_set don't return a GMT timestamp if one
  passes an offset).
- MFH: Fixed bug #32820 (date_sunrise and date_sunset don't handle GMT offset
  well).
- MFH: Fixed bug #30937 (date_sunrise() & date_sunset() don't handle endless
  day/night at high latitudes).
2006-01-04 21:31:35 +00:00
foobar 5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00