1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

34484 Commits

Author SHA1 Message Date
Julien Pauli ee709c5366 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:12:08 +01:00
Peter Cowburn 557026301f Fixed #68479 - Added escape parameter to SplFileObject::fputcsv 2014-12-05 10:10:10 +01:00
Anatol Belski 6cf5ac7567 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separators in test
2014-12-05 07:08:35 +01:00
Anatol Belski c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Tjerk Meesters 52b41f24e3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:21:13 +08:00
Tjerk Meesters 2bcf8a6cd9 Fixed #65213 - cannot cast SplFileInfo to boolean 2014-12-04 07:17:33 +08:00
Dmitry Stogov cd68c4b1d2 Fixed __debugInfo() support 2014-12-03 12:13:01 +03:00
Remi Collet 6f3714a8fc Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
Covered by ext/standard/tests/strings/pack64.phpt
2014-12-02 08:38:39 +01:00
Anatol Belski c45fcfd063 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  one more refix to the test
2014-12-01 19:10:18 +01:00
Anatol Belski a0c03a3ec5 one more refix to the test 2014-12-01 19:09:39 +01:00
Anatol Belski fe4a5abf30 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in test
2014-12-01 18:55:52 +01:00
Anatol Belski b6d624e54e fix dir separator in test 2014-12-01 18:55:20 +01:00
Tjerk Meesters bfe7c6988f Added more useful warning messages 2014-11-30 22:42:13 -08:00
Tjerk Meesters 904dca6392 Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:42:13 -08:00
Tjerk Meesters d037785165 Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:42:13 -08:00
Tjerk Meesters 85e2e6c1fd Added more useful warning messages 2014-11-30 22:39:25 -08:00
Tjerk Meesters 977d84490b Changed based on comments and make its behaviour equal to the Windows version 2014-11-30 22:39:18 -08:00
Tjerk Meesters 7b44790db5 Fix #53092 - dns_get_record does not return false on dns server failure 2014-11-30 22:39:09 -08:00
Stanislav Malyshev e0b6e5222b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:22:01 -08:00
Jille Timmermans 1b4368db77 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-30 22:18:22 -08:00
Jille Timmermans 7049d3450e Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set) 2014-11-30 22:18:12 -08:00
Stanislav Malyshev 85bada10c1 fix ZTS 2014-11-30 21:50:29 -08:00
Stanislav Malyshev 720ba67948 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  update news
  update NEWS
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
2014-11-30 21:39:49 -08:00
Stanislav Malyshev abf5b9481b Merge branch 'pull-request/868' into PHP-5.5
* pull-request/868:
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3
2014-11-30 21:09:41 -08:00
m.bennewitz 4675b79e65 Conflicts:
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
Stanislav Malyshev de65eaa8c8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:39 -08:00
Stanislav Malyshev 17094017f7 Merge branch 'pull-request/914' into PHP-5.5
* pull-request/914:
  Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:17 -08:00
Stanislav Malyshev 8c08124c0e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
2014-11-30 18:24:23 -08:00
Dominic Luechinger 6048ac32b4 Adds test cases for openssl EC improvements 2014-11-30 18:17:48 -08:00
Dominic Luechinger 5d1cc7d135 Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details

Conflicts:
	ext/openssl/openssl.c
2014-11-30 18:02:55 -08:00
Stanislav Malyshev aae5d4d9db Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  fix typo
2014-11-30 17:34:51 -08:00
Stanislav Malyshev 977974f95f fix typo 2014-11-30 17:09:53 -08:00
Stanislav Malyshev 60d5b2ec24 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added test and review suggestion
  Fix bug #68335: rmdir doesnt work with file:// stream wrapper
2014-11-30 17:07:02 -08:00
mcq8 04808aa7e1 Added test and review suggestion 2014-11-30 16:38:20 -08:00
Stanislav Malyshev f6aa6324fb fix tests for systems with no de_DE locales 2014-11-30 16:12:56 -08:00
Julien Pauli 736279239e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Fix #60509, pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:41:06 +01:00
Julien Pauli 19b5bc8ce2 Fix #60509, pcntl_signal doesn't decrease ref-count of old handler 2014-11-29 14:39:19 +01:00
Julien Pauli a93fb3524e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
2014-11-29 12:11:06 +01:00
Paul Garvin 605d32bedd SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
Currently when you use RecursiveDirectoryIterator with the
CURRENT_AS_PATHNAME flag PHP will throw an UnexpectedValueException with
message 'Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator'.This happend because getChildren() will return the
current directory name instead of an Iterator (or subclass of) as required
by the RecursiveIterator interface.

This commit changes getChildren() to return annother
RecursiveDirectoryIterator but current() still returns the path name when
CURRENT_AS_PATHNAME is used. A PHPT test case (bug66405.phpt) that
reproduces the bug is included.

This fix was originally against the PHP-5.4 branch, but it was not merged
before 5.4 reached EOL. I am hoping to get it applied to 5.5, 5.6, and
master.
2014-11-29 12:04:44 +01:00
Julien Pauli 4bf299a250 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:39:37 +01:00
Julien Pauli 1813fe9f38 Merge branch 'pull-request/656' into PHP-5.5
* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:57 +01:00
Popa Marius Adrian cf2cd8fb20 PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:36 +01:00
Anatol Belski 1552d6ae7b disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
2014-11-28 12:24:32 +01:00
Anatol Belski 088f8b528b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  refactored the mbstring config.w32
  Fixed bug #68504 --with-libmbfl configure option not present on Windows
2014-11-27 13:39:23 +01:00
Anatol Belski 42af411620 refactored the mbstring config.w32 2014-11-27 13:37:00 +01:00
Anatol Belski 3ec8730e89 Fixed bug #68504 --with-libmbfl configure option not present on Windows 2014-11-27 09:14:47 +01:00
Ferenc Kovacs fcf21c4d00 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  5.5.21 now

Conflicts:
	configure.in
	main/php_version.h
2014-11-27 00:13:11 +01:00
Ferenc Kovacs 5d67e8617b the darwin specific test fails for me with the same output which is the expected for the original test
I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on
qa.php.net/reports and on google which do see this test failing on mac.
if this change causes you to have this test failing on Mac, please drop me a mail so we can improve
the current test so it passes for everybody.
2014-11-27 00:08:40 +01:00
Stanislav Malyshev faa396c67d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move tests into proper place
2014-11-24 12:26:50 -08:00
Stanislav Malyshev f86aa349eb move tests into proper place 2014-11-24 12:26:20 -08:00