1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Commit Graph

73402 Commits

Author SHA1 Message Date
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 5dd73b9e54 Merge branch 'splitting-out-date-time-immutable' into PHP-5.5 2013-03-31 10:39:01 +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
Stanislav Malyshev 61fff1fd8b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #64433: does not follow redirects for non-3xx response codes
2013-03-30 21:24:21 -07:00
Sergey Akbarov 1d4fcdff9f Fix bug #64433: does not follow redirects for non-3xx response codes 2013-03-30 21:22:30 -07:00
Xinchen Hui bed44e562e missed part of the patch 2013-03-29 23:47:46 +08:00
Xinchen Hui 953f07503a Fixed bug #64544 (Valgrind warnings after using putenv)
The frozen_envion is needed, since if an item in environ is updated
(like the test script HOME one), invalid free still shows up
2013-03-29 23:42:50 +08:00
Keyur Govande b2a760fe45 Merge branch 'pull-request/313' into PHP-5.5
* pull-request/313:
  Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
2013-03-29 14:42:16 +00:00
Keyur Govande 00d961cf6a Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src: (266 commits)
  Fix "passing NULL to non-pointer argument" warnings in intl
  Remove support for cloning generators
  Removed deprecated check
  Fix whitespace issue in the SOAP test
  Fix SOAP test
  Forgot to fix the test on 5.4
  Exclude Travis build for 5.3 and 5.4
  Fix tests after addition of ^ (xor) operator to ini
  Fix Bug #64545:	PHP Error in ef93a93ee2
  Attempt to fix SKIP
  This will PHP 5.3.25
  Typo fix (greater then => greater than)
  don't optimize script if it's not going to be cached
  Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
  Fixed issue #78 (incorrect file path validation)
  Fix test on Mac (\D shows up)
  Add test for #64529
  will be 5.4.15
  fix NEWS
  ...
2013-03-29 14:35:45 +00:00
Keyur Govande 5bf6323e51 Patch for Bug #64544.
The process title change module keeps track of the locally allocated
environ, so it doesn't need to worry about when environ changes
underneath it, for example by putenv()/setenv()
2013-03-29 14:27:36 +00:00
Nikita Popov 8aff7f0528 Fix "passing NULL to non-pointer argument" warnings in intl
The second argument to spprintf is a size_t (maximum length).
2013-03-29 12:55:00 +01:00
Nikita Popov 8345abcabb Remove support for cloning generators 2013-03-29 11:42:10 +01:00
Dmitry Stogov aa791a4d72 Removed deprecated check 2013-03-29 03:18:04 +04:00
Nikita Popov 0e25e00ecf Fix whitespace issue in the SOAP test 2013-03-28 19:10:57 +01:00
Nikita Popov a5e606a2ba Fix SOAP test
Doesn't look like these warnings are present anymore.
2013-03-28 19:05:06 +01:00
Nikita Popov 15994a14a4 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	.travis.yml
2013-03-28 18:43:11 +01:00
Nikita Popov 92aa361bfc Forgot to fix the test on 5.4 2013-03-28 18:42:01 +01:00
Nikita Popov bbe9052ca3 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-28 18:41:34 +01:00
Nikita Popov fecce5a55f Exclude Travis build for 5.3 and 5.4 2013-03-28 18:40:57 +01:00
Nikita Popov dcf0b71c98 Fix tests after addition of ^ (xor) operator to ini 2013-03-28 18:35:46 +01:00
Nikita Popov b1a6a17039 Fix Bug #64545: PHP Error in ef93a93ee2
Test was using die "Foo" instead of die("Foo").
2013-03-28 18:23:23 +01:00
Xinchen Hui 127c78cb76 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 23:23:07 +08:00
Xinchen Hui ef93a93ee2 Attempt to fix SKIP 2013-03-28 23:22:20 +08:00
Johannes Schlüter e6ef89861e Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 15:09:06 +01:00
Johannes Schlüter 242d88c20c Merge branch 'PHP-5.3' into PHP-5.4 2013-03-28 15:08:30 +01:00
Johannes Schlüter 46ee57f2d7 This will PHP 5.3.25 2013-03-28 15:05:46 +01:00
Xinchen Hui f4daaf9250 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 19:13:58 +08:00
Veres Lajos 124a867b6a Typo fix (greater then => greater than) 2013-03-28 19:12:08 +08:00
Dmitry Stogov 86d301b232 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 13:48:18 +04:00
Dmitry Stogov 3ae5c55596 don't optimize script if it's not going to be cached 2013-03-28 13:45:40 +04:00
Dmitry Stogov 037ea6f360 Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway). 2013-03-28 13:34:59 +04:00
Remi Collet 201128d39c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 10:25:39 +01:00
Remi Collet 640e72ce91 With pkgconfig < 0.28 output is a single space
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars

Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
2013-03-28 10:22:20 +01:00
Dmitry Stogov 031553cd01 Fixed issue #78 (incorrect file path validation) 2013-03-28 12:30:18 +04:00
Xinchen Hui 7dd661d0cd Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 14:35:02 +08:00
Xinchen Hui ab089611e0 Fix test on Mac (\D shows up) 2013-03-28 14:34:08 +08:00
Xinchen Hui ae71c1d9aa Merge branch 'PHP-5.4' into PHP-5.5 2013-03-28 13:54:37 +08:00
Xinchen Hui 55341ac0a8 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-03-28 13:54:04 +08:00
Xinchen Hui 467cd6a60f Add test for #64529 2013-03-28 13:45:42 +08:00
Stanislav Malyshev 5d535a007d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  will be 5.4.15
  fix NEWS

Conflicts:
	configure.in
	main/php_version.h
2013-03-27 14:02:14 -07:00
Stanislav Malyshev f982aaafa7 will be 5.4.15 2013-03-27 14:00:12 -07:00
Stanislav Malyshev 210d43d7a2 fix NEWS 2013-03-27 13:57:53 -07:00
Lars Strojny 25b3c94944 Added XOR support for expressions in INI parser: NEWS and zend_language_scanner.c 2013-03-27 21:30:56 +01:00