Commit Graph

81042 Commits

Author SHA1 Message Date
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
f7eedbe9a6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update news

Conflicts:
	ext/standard/crypt.c
2014-11-30 21:38:30 -08:00
Stanislav Malyshev
84be568366 update news 2014-11-30 21:37:39 -08:00
Stanislav Malyshev
3003793480 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  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
2014-11-30 21:12:17 -08:00
Stanislav Malyshev
39007e23a4 update news 2014-11-30 21:12:03 -08:00
Stanislav Malyshev
4d162a2d9b update NEWS 2014-11-30 21:11:20 -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
Leigh
301b7f990a Apply error-code-salt fix to Windows too
Conflicts:
	ext/standard/crypt.c
2014-11-30 21:07:31 -08:00
Leigh
7e870c596d Bug fixes in light of failing bcrypt tests
Conflicts:
	ext/standard/crypt.c
2014-11-30 21:06:39 -08:00
Leigh
2d9d10fbbf Add tests from 1.3. Add missing tests.
3 of the missing tests fail. // TODO
2014-11-30 21:05:40 -08:00
Leigh
29f51e1ca9 Upgrade crypt_blowfish to version 1.3 2014-11-30 21:05:32 -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
ffb62112f8 Update NEWS 2014-11-30 17:34:07 -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
mcq8
6eaa4d01d3 Fix bug #68335: rmdir doesnt work with file:// stream wrapper 2014-11-30 16:38:13 -08:00
Stanislav Malyshev
f6aa6324fb fix tests for systems with no de_DE locales 2014-11-30 16:12:56 -08:00
Remi Collet
e1d4ac426c Move chown to fpm_unix_set_socket_premissions()
For consistency, with fpm_unix_resolve_socket_premissions.
Compute + Use in the same source file.
To make easier future enhancement.

Also check chdir output to fix a build warning.
2014-11-29 16:49:08 +01:00
Julien Pauli
57d7b4fc56 Updated NEWS 2014-11-29 14:41:48 +01: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
40e518b4c3 Updated NEWS 2014-11-29 14:40:47 +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
c4f9f1ff4c Updated NEWS 2014-11-29 12:11:27 +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
Julien Pauli
59bd4117ac Updated NEWS 2014-11-29 12:10:54 +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
Ferenc Kovacs
7e4b77c921 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test with readline on mac
2014-11-29 01:49:23 +01:00
Ferenc Kovacs
108bf84967 fix test with readline on mac 2014-11-29 01:47:45 +01:00
Julien Pauli
a76f8e297d updated NEWS 2014-11-28 13:27:46 +01:00
Julien Pauli
b248a7a95c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fix #65419 - Inside trait, self::class != __CLASS__
2014-11-28 13:26:53 +01:00
Julien Pauli
619adc9795 updated NEWS 2014-11-28 13:26:20 +01:00
Julien Pauli
7c77ca38b1 Fix #65419 - Inside trait, self::class != __CLASS__ 2014-11-28 13:24:25 +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
b0645abdcc updated NEWS 2014-11-27 13:40:07 +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
Ferenc Kovacs
543ad4b2d3 #68446 is fixed 2014-11-26 23:12:49 +01:00