clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,468 Commits 491 Branches 1,363 Tags 846 MiB
3e8dbb3e5d
Commit Graph

94468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
3e8dbb3e5d Fixed bug #72569 DOTNET/COM array parameters broke in PHP7 2016-07-12 14:58:50 +02:00
Christoph M. Becker
5fbcc2b90f Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/intl/idn/idn.c
 2016-07-12 14:52:23 +02:00
Christoph M. Becker
76e249d31c Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain names 
We don't actually fix this issue wrt. the empty $info array, because it is
not clear what this array should contain and we're concerned about the
potential BC break, but at least we fix the inconsistent handling of
resulting domains with 255 bytes (which raise an error), and longer domains
(which just return FALSE), what has to be considered a very minor BC break
if at all.
 2016-07-12 14:47:14 +02:00
Anatol Belski
aabca89f95 update NEWS 2016-07-12 13:01:54 +02:00
y-uti
acc58f1845 Make phpize set a proper build type (windows) 2016-07-12 12:59:11 +02:00
Julien Pauli
ca08ed417e Updated NEWS 2016-07-12 11:17:58 +02:00
Julien Pauli
ec28576260 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.

Conflicts:
	ext/pdo/pdo_stmt.c
 2016-07-12 11:17:36 +02:00
Julien Pauli
17d4f5c2f8 Updated NEWS 2016-07-12 10:49:04 +02:00
Bishop Bettini
15336b44d9 Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT. 2016-07-12 10:47:07 +02:00
Julien Pauli
932191a6ed Updated NEWS 2016-07-12 10:38:40 +02:00
Julien Pauli
3c356aa7cb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fix #72575: using --allow-to-run-as-root should ignore missing user directive
 2016-07-12 10:38:22 +02:00
Julien Pauli
403f23b460 Updated NEWS 2016-07-12 10:37:59 +02:00
gooh
fb49f137ec Fix #72575: using --allow-to-run-as-root should ignore missing user 
directive

Trying to start PHP-FPM with the --allow-to-run-as-root flag will not
work when the user directive is not given in the FPM worker pool
configuration. Parsing the config will fail. Consequently, FPM cannot
start.

The check is in place to prevent FPM from getting started with root
privileges by accident. Prior to #61295 the check would also prevent
any non-root user to start PHP-FPM without a user directive present.

This patch adds an additional check to the config parser, checking for
the --allow-to-run-as-root flag to be present. If so, parsing will no
longer abort for root users even if the user directive is missing.

I will also update the PHP docs since they still state the user
directive is a mandatory setting which it is not since #61295.
 2016-07-12 10:36:17 +02:00
Julien Pauli
a8566ee800 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fix 72122 - don't use EH_THROW for calls to getIterator
 2016-07-12 10:20:01 +02:00
Julien Pauli
d2d17e14ee Updated NEWS 2016-07-12 10:19:45 +02:00
Loz Calver
f5ccd71d0c Fix 72122 - don't use EH_THROW for calls to getIterator 2016-07-12 10:10:35 +02:00
Xinchen Hui
f71fcf8bdd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  backport to 5.6 (we should not unset the default value)

Conflicts:
	Zend/zend_exceptions.c
	ext/standard/tests/serialize/bug69152.phpt
 2016-07-12 12:18:09 +08:00
Xinchen Hui
7903276f4c backport to 5.6 (we should not unset the default value) 2016-07-12 12:14:45 +08:00
Xinchen Hui
42902919bc Fixed bug #72581 (previous property undefined in Exception after deserialization) 2016-07-12 11:51:20 +08:00
Christoph M. Becker
90e11e0c13 Update NEWS 2016-07-11 16:09:12 +02:00
Christoph M. Becker
23d4c9e6c7 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 16:08:10 +02:00
Christoph M. Becker
966311e627 Bug #66836 has been fixed 2016-07-11 16:06:35 +02:00
Julien Pauli
fc2c301fe2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:58:55 +02:00
Julien Pauli
2552cf248d Remove needless zeroing of anonymously mmap'd memory 2016-07-11 14:58:12 +02:00
Michael McConville
9dd5d96332 Remove needless zeroing of anonymously mmap'd memory 
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
 2016-07-11 14:56:17 +02:00
Derick Rethans
7759d6b0db Merge branch 'PHP-5.6' into PHP-7.0 2016-07-11 11:32:10 +01:00
Derick Rethans
6a5e1783b7 Generate new .c file from .re file, as that was missing on my previous commit 2016-07-11 11:31:43 +01:00
Xinchen Hui
a19655cfe3 Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash) 2016-07-11 11:51:19 +08:00
Matteo Beccati
4d677ae0e2 Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders 2016-07-10 14:36:07 +02:00
Matteo Beccati
11d74b5b79 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #70313 PDO statement fails to throw exception
 2016-07-10 14:34:59 +02:00
Matteo Beccati
219ebcb689 Fixed bug #70313 PDO statement fails to throw exception 2016-07-10 14:33:56 +02:00
Julien Pauli
6725863993 Updated NEWS 2016-07-08 16:32:32 +02:00
Julien Pauli
13a5c54068 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890
 2016-07-08 16:31:53 +02:00
Julien Pauli
51d19891a4 Updated NEWS 2016-07-08 16:31:42 +02:00
Jos Elstgeest
6fc7817558 update filter_var filters for ipv4 addresses to reflect rfc6890 2016-07-08 16:30:06 +02:00
Adam Baratz
8db64e919c Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false 2016-07-08 15:54:52 +02:00
Julien Pauli
a8df121e18 Updated NEWS 2016-07-08 15:06:21 +02:00
Julien Pauli
87fe485c35 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Backported bug #71144 (Segmentation fault when using cURL with ZTS)
  fix bug #72024 (microtime() leaks memory)

Conflicts:
	ext/curl/interface.c
 2016-07-08 15:05:13 +02:00
Julien Pauli
1071a2655f Updated NEWS 2016-07-08 15:04:13 +02:00
Julien Pauli
78d5783b62 Backported bug #71144 (Segmentation fault when using cURL with ZTS) 2016-07-08 14:58:56 +02:00
Michael Maroszek
0be13d2dc2 fix bug #72024 (microtime() leaks memory) 2016-07-08 14:36:44 +02:00
Remi Collet
7ae00f08cf NEWS 2016-07-08 10:47:40 +02:00
Remi Collet
99d6e09c3d Fixed Bug #72564 boolean always deserialized as "true" 2016-07-08 10:46:33 +02:00
Remi Collet
76a143c27c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add test for bug #72564 (7.x regression)
 2016-07-08 10:45:32 +02:00
Remi Collet
bfc42211d3 add test for bug #72564 (7.x regression) 2016-07-08 10:45:13 +02:00
Christopher Jones
fae6407314 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-07 11:52:39 +10:00
Christopher Jones
8b905e337c Mask DB usernames from expected test output for test portability 2016-07-07 11:52:17 +10:00
Ferenc Kovacs
3580b9f8b6 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-07 01:49:05 +02:00
Ferenc Kovacs
2b7cd813e7 merge NEWS blocks 2016-07-07 01:46:02 +02:00
Nikita Popov
06b6cb0ab0 Add NEWS entries 2016-07-07 01:31:04 +02:00