1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Commit Graph

1079 Commits

Author SHA1 Message Date
Remi Collet 6fab1caa41 Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:45:33 +02:00
Remi Collet a5749eb0cb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:43:12 +02:00
Remi Collet d69513afec Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:42:08 +02:00
Stanislav Malyshev 825a505494 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
2013-08-25 15:14:17 -07:00
gron1987 e6424d89e9 Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end 2013-08-25 15:09:29 -07:00
Stanislav Malyshev c0bfccafd2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:54 -07:00
Alexander Moskalev b378b0b081 Fix DateInterval->days value when object was created not from DateTime::diff() 2013-08-24 23:38:33 -07:00
Anatol Belski a2b1546f3b ensure the test doesn't fail because of tz warning 2013-08-23 16:40:28 +02:00
Christopher Jones 39612afc72 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones 9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Stanislav Malyshev c793a65690 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07: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
Anatol Belski 332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02:00
Anatol Belski 5324416b65 Fixed bug #65184 strftime() returns insufficient-length
string under multibyte locales

The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.

See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
2013-07-03 11:12:46 +02:00
Stanislav Malyshev ae5a09b47d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  seems to be working fine for me on 32-bit
2013-06-23 23:37:10 -07:00
Stanislav Malyshev a0d48e01ed seems to be working fine for me on 32-bit 2013-06-23 23:36:43 -07:00
Anatol Belski cb542d3c83 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed tests
2013-06-11 12:39:50 +02:00
Anatol Belski 1cc750493f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fixed tests
2013-06-11 12:39:28 +02:00
Anatol Belski eccc05fc44 fixed tests 2013-06-11 12:38:49 +02:00
Anatol Belski 251ec84a97 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  missing tests for bug #53437
2013-06-11 11:22:55 +02:00
Anatol Belski f16143f5ac missing tests for bug #53437 2013-06-11 11:19:57 +02:00
Anatol Belski bd4f6ad8a0 fixed EOL 2013-06-11 08:32:54 +02:00
Anatol Belski 28e264db2a added closing ?> 2013-06-11 08:25:38 +02:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Anatol Belski ec79075394 split the test for 32 and 64 bit 2013-06-10 22:49:30 +02:00
Anatol Belski 0f9cf35315 Backported the fix for bug #53437 2013-06-10 19:52:29 +02:00
Anatol Belski 88c2dbe5fc Backported the fix for bug #53437 2013-06-10 19:48:18 +02:00
Anatol Belski 760c85a70a fixed the test 2013-06-10 18:31:18 +02:00
Anatol Belski 02f3922047 Fix a BC breach related to bug #53437
days and special_amount properties are exported as int again
2013-06-10 17:48:13 +02:00
Anatol Belski e44849b0f4 Fixed bug #64825 Invalid free unserializing DateTimeZone 2013-05-12 21:29:16 +02:00
David Soria Parra b86c85723e Fix #64711 ("value computed but not used" in parse_date.c) 2013-04-26 11:33:54 +02:00
David Soria Parra 75cec90d8c Fix #64712 (Obsolete declarations in php_date.c) 2013-04-26 10:45:08 +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
Xinchen Hui 9456dac54e Fix test 2013-04-01 18:12:16 +08:00
Xinchen Hui 2f6b9b970c Fix typo (it's in DateTime::__wakeup) 2013-03-31 20:07:14 +08:00
Derick Rethans 503760c913 Updated test case and added BFN to NEWS. 2013-03-31 11:07:24 +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
Lonny Kapelushnik a1ebd82a29 Fixed the test to use %d instead of an actual number 2013-03-31 10:45:00 +01:00
Lonny Kapelushnik 30d0ae42b5 Bug 54567 DateTimeZone serialize/unserialize
Make DateTimeZone serializable and implement __set_state
2013-03-31 10:45:00 +01:00
Derick Rethans 68a7fec7af Make DateTime and DateTimeImmutable siblings.
They both implement the DateTimeInterface interface, which specifies the
non-modifying methods of DateTime/DateTimeImmutable.
2013-03-31 10:37:16 +01:00