1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

7879 Commits

Author SHA1 Message Date
Xinchen Hui 2794d455ea Merge branch 'PHP-5.5' 2013-04-04 19:31:21 +08:00
Xinchen Hui 01ca2bf8c3 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/curl/interface.c
2013-04-04 19:31:14 +08:00
Xinchen Hui 185e5e15ae s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, 2013-04-04 19:28:17 +08:00
Xinchen Hui e15a97f924 Merge branch 'PHP-5.5' 2013-04-03 18:51:44 +08:00
Xinchen Hui bbb4a44f98 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 18:51:19 +08:00
ptarjan 99ad08f9a5 Fix #64572: Clean up after the test
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
Xinchen Hui bd6a90dac7 Merge branch 'PHP-5.5' 2013-04-03 10:17:49 +08:00
Xinchen Hui 6ace9c646b Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/curl/interface.c
2013-04-03 10:15:41 +08:00
Xinchen Hui 78a9489f6a Use new constant replace ugly trick 2013-04-03 10:12:49 +08:00
Xinchen Hui aa1c764e3e Merge branch 'PHP-5.5' 2013-04-01 19:16:44 +08:00
Xinchen Hui d8a5f41a60 Fixed bug parameter is casted to string of array_column 2013-04-01 19:11:45 +08:00
Xinchen Hui 971676e859 Merge branch 'PHP-5.5' 2013-03-31 21:27:22 +08:00
Xinchen Hui ad7c0b1928 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-31 21:26:26 +08:00
Xinchen Hui 72426a446d Skip test when --with-curlwrappers enabled. 2013-03-31 21:22:48 +08:00
Stanislav Malyshev da43e7e0cd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64433: does not follow redirects for non-3xx response codes
2013-03-30 21:24:54 -07: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
Keyur Govande 415d077e08 Merge branch 'PHP-5.5'
* PHP-5.5: (276 commits)
  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()
  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
  ...
2013-03-29 14:44:35 +00:00
Nikita Popov dcf0b71c98 Fix tests after addition of ^ (xor) operator to ini 2013-03-28 18:35: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
Pierre Joye f01a7e54d3 add windows 8 and windows server 2012 2013-03-27 07:29:47 +01:00
Xinchen Hui b29a9fa75d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 11:14:36 +08:00
Xinchen Hui 0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
David Soria Parra 0173c4bab0 Merge branch 'pull-request/257' into PHP-5.5
* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Ben Ramsey f5bf1ba88f array_column: Fix compile-time warnings 2013-03-19 20:44:19 -05:00
Anatol Belski 90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Nikita Popov 28634bf603 Forgot to remove some now unused variables 2013-03-12 17:39:20 +01:00
Nikita Popov fcc6611de9 Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Anatol Belski 278c4097c6 fixed the test 2013-03-11 16:14:39 +01:00
Anatol Belski 8aaa09636a Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']) 2013-03-11 16:04:37 +01:00
Xinchen Hui 1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	ext/standard/var_unserializer.c
2013-03-09 23:10:48 +08:00
Xinchen Hui f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
2013-03-09 23:00:58 +08:00
David Soria Parra 3adb1aa89e Merge branch 'PHP-5.5'
* PHP-5.5:
  Typo fix: recieved to received
2013-03-07 23:05:14 +01:00
Carson McDonald 0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Xinchen Hui a3c0942cb0 Merge branch 'PHP-5.5' 2013-03-03 11:14:34 +08:00
Xinchen Hui 2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +08:00
Sara Golemon f54a87e3ab Merge branch 'PHP-5.5'
* PHP-5.5:
  http-stream test requires network connectivity
2013-02-21 03:22:31 -08:00
Sara Golemon ead2e1708d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  http-stream test requires network connectivity
2013-02-21 03:22:09 -08:00
Sara Golemon c16d6befd4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  http-stream test requires network connectivity
2013-02-21 03:21:49 -08:00
Sara Golemon bc55a8eb9f http-stream test requires network connectivity 2013-02-21 03:21:23 -08:00
Stanislav Malyshev 4c293bfe91 Merge branch 'PHP-5.5'
* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Stanislav Malyshev 0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00
Stanislav Malyshev 861c16d656 Merge branch 'PHP-5.5'
* PHP-5.5:
  complete zts fix
2013-01-29 12:12:58 -08:00
Stanislav Malyshev 748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Stanislav Malyshev 0ad8940814 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:29:11 -08:00
Stanislav Malyshev 489073b501 Merge branch 'PHp-5.4' into PHP-5.5
* PHp-5.4:
  Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:28:50 -08:00
Stanislav Malyshev 5382e156f9 Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses 2013-01-29 00:27:35 -08:00
Xinchen Hui 679f6e3f56 Merge branch 'PHP-5.5' 2013-01-21 11:49:01 +08:00