]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Tue, 12 Jul 2016 04:18:09 +0000 (12:18 +0800)]
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

8 years agobackport to 5.6 (we should not unset the default value)
Xinchen Hui [Tue, 12 Jul 2016 04:14:45 +0000 (12:14 +0800)]
backport to 5.6 (we should not unset the default value)

8 years agoFixed bug #72581 (previous property undefined in Exception after deserialization)
Xinchen Hui [Tue, 12 Jul 2016 03:51:20 +0000 (11:51 +0800)]
Fixed bug #72581 (previous property undefined in Exception after deserialization)

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 11 Jul 2016 14:09:12 +0000 (16:09 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 11 Jul 2016 14:08:10 +0000 (16:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoBug #66836 has been fixed
Christoph M. Becker [Mon, 11 Jul 2016 14:06:35 +0000 (16:06 +0200)]
Bug #66836 has been fixed

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 11 Jul 2016 12:58:55 +0000 (14:58 +0200)]
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

8 years agoRemove needless zeroing of anonymously mmap'd memory
Julien Pauli [Mon, 11 Jul 2016 12:58:12 +0000 (14:58 +0200)]
Remove needless zeroing of anonymously mmap'd memory

8 years agoRemove needless zeroing of anonymously mmap'd memory
Michael McConville [Tue, 26 Apr 2016 17:16:38 +0000 (13:16 -0400)]
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.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Mon, 11 Jul 2016 10:32:10 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoGenerate new .c file from .re file, as that was missing on my previous commit
Derick Rethans [Mon, 11 Jul 2016 10:31:43 +0000 (11:31 +0100)]
Generate new .c file from .re file, as that was missing on my previous commit

8 years agoFixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
Xinchen Hui [Mon, 11 Jul 2016 03:51:19 +0000 (11:51 +0800)]
Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)

8 years agoFixed bug #72570 Segmentation fault when binding parameters on a query without placeh...
Matteo Beccati [Sun, 10 Jul 2016 12:36:07 +0000 (14:36 +0200)]
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Matteo Beccati [Sun, 10 Jul 2016 12:34:59 +0000 (14:34 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #70313 PDO statement fails to throw exception

8 years agoFixed bug #70313 PDO statement fails to throw exception
Matteo Beccati [Sun, 10 Jul 2016 11:04:49 +0000 (13:04 +0200)]
Fixed bug #70313 PDO statement fails to throw exception

8 years agoUpdated NEWS
Julien Pauli [Fri, 8 Jul 2016 14:32:32 +0000 (16:32 +0200)]
Updated NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Fri, 8 Jul 2016 14:31:53 +0000 (16:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  update filter_var filters for ipv4 addresses to reflect rfc6890

8 years agoUpdated NEWS
Julien Pauli [Fri, 8 Jul 2016 14:31:42 +0000 (16:31 +0200)]
Updated NEWS

8 years agoupdate filter_var filters for ipv4 addresses to reflect rfc6890
Jos Elstgeest [Fri, 24 Jun 2016 22:47:15 +0000 (00:47 +0200)]
update filter_var filters for ipv4 addresses to reflect rfc6890

8 years agoCorrect for connection with PDO::ATTR_STRINGIFY_FETCHES set to false
Adam Baratz [Wed, 15 Jun 2016 21:42:34 +0000 (17:42 -0400)]
Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false

8 years agoUpdated NEWS
Julien Pauli [Fri, 8 Jul 2016 13:06:21 +0000 (15:06 +0200)]
Updated NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Fri, 8 Jul 2016 13:05:13 +0000 (15:05 +0200)]
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

8 years agoUpdated NEWS
Julien Pauli [Fri, 8 Jul 2016 12:59:16 +0000 (14:59 +0200)]
Updated NEWS

8 years agoBackported bug #71144 (Segmentation fault when using cURL with ZTS)
Julien Pauli [Fri, 8 Jul 2016 12:58:56 +0000 (14:58 +0200)]
Backported bug #71144 (Segmentation fault when using cURL with ZTS)

8 years agofix bug #72024 (microtime() leaks memory)
Michael Maroszek [Thu, 7 Jul 2016 12:24:05 +0000 (14:24 +0200)]
fix bug #72024 (microtime() leaks memory)

8 years agoNEWS
Remi Collet [Fri, 8 Jul 2016 08:47:40 +0000 (10:47 +0200)]
NEWS

8 years agoFixed Bug #72564 boolean always deserialized as "true"
Remi Collet [Fri, 8 Jul 2016 08:46:33 +0000 (10:46 +0200)]
Fixed Bug #72564 boolean always deserialized as "true"

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Fri, 8 Jul 2016 08:45:32 +0000 (10:45 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add test for bug #72564 (7.x regression)

8 years agoadd test for bug #72564 (7.x regression)
Remi Collet [Fri, 8 Jul 2016 08:45:13 +0000 (10:45 +0200)]
add test for bug #72564 (7.x regression)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christopher Jones [Thu, 7 Jul 2016 01:52:39 +0000 (11:52 +1000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMask DB usernames from expected test output for test portability
Christopher Jones [Thu, 7 Jul 2016 01:52:17 +0000 (11:52 +1000)]
Mask DB usernames from expected test output for test portability

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 6 Jul 2016 23:49:05 +0000 (01:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agomerge NEWS blocks
Ferenc Kovacs [Wed, 6 Jul 2016 23:46:02 +0000 (01:46 +0200)]
merge NEWS blocks

8 years agoAdd NEWS entries
Nikita Popov [Wed, 6 Jul 2016 23:31:04 +0000 (01:31 +0200)]
Add NEWS entries

8 years agobase64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode)
Lauri Kenttä [Wed, 25 May 2016 19:06:42 +0000 (22:06 +0300)]
base64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode)

8 years agobase64_decode: remove redundant code
Lauri Kenttä [Wed, 25 May 2016 16:52:11 +0000 (19:52 +0300)]
base64_decode: remove redundant code

case 1 is already handled in the first lines of the for loop;
it would only be entered in the invalid case where the string
continues past the defined length (ch != 0 but length-- == 0).

case 2 and case 3 are redundant, since k >= j and later the
string is truncated to j characters anyway.

8 years agobase64_decode: fix bug #72263 (skips char after padding)
Lauri Kenttä [Wed, 25 May 2016 17:53:47 +0000 (20:53 +0300)]
base64_decode: fix bug #72263 (skips char after padding)

8 years agobase64_decode: fix bug #72152 (fail on NUL bytes in strict mode)
Lauri Kenttä [Wed, 25 May 2016 18:02:41 +0000 (21:02 +0300)]
base64_decode: fix bug #72152 (fail on NUL bytes in strict mode)

This added check is actually for NOT failing in NON-strict mode.
The ch == -2 check later causes the desired failure in strict mode.

8 years agobase64_decode: remove redundant check
Lauri Kenttä [Wed, 25 May 2016 18:15:52 +0000 (21:15 +0300)]
base64_decode: remove redundant check

If length == 0 || *current != '=' is false, the for loop will always
end up in this same point, until the if statement becomes true.
Thus, the if statement is not needed.

8 years agobase64_decode: reorder to fix out of bounds read
Lauri Kenttä [Wed, 25 May 2016 17:28:45 +0000 (20:28 +0300)]
base64_decode: reorder to fix out of bounds read

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 6 Jul 2016 23:16:58 +0000 (01:16 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
configure.in
main/php_version.h

8 years ago5.6.25 is next
Ferenc Kovacs [Wed, 6 Jul 2016 22:09:48 +0000 (00:09 +0200)]
5.6.25 is next

8 years agoUpdated to version 2016.6 (2016f)
Derick Rethans [Wed, 6 Jul 2016 10:15:45 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)

8 years agoEmpty merge
Derick Rethans [Wed, 6 Jul 2016 10:15:44 +0000 (11:15 +0100)]
Empty merge

8 years agoUpdated to version 2016.6 (2016f)
Derick Rethans [Wed, 6 Jul 2016 10:15:42 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)

8 years agoRewrite test to avoid sending emails
Matteo Beccati [Wed, 6 Jul 2016 05:08:43 +0000 (07:08 +0200)]
Rewrite test to avoid sending emails

A properly configured email server was generating bounce emails when running
the test.

8 years agoUpdate NEWS
Christoph M. Becker [Tue, 5 Jul 2016 14:49:40 +0000 (16:49 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 5 Jul 2016 14:43:39 +0000 (16:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/spl/spl_directory.c

8 years agoFix bug #55701: GlobIterator throws LogicException
Valentin VALCIU [Thu, 21 Apr 2016 16:02:52 +0000 (19:02 +0300)]
Fix bug #55701: GlobIterator throws LogicException

GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.

# Resolved conflicts:
# ext/spl/spl_directory.c

8 years agoUse size_t instead of int for loop counter
Adam Baratz [Fri, 1 Jul 2016 19:39:02 +0000 (15:39 -0400)]
Use size_t instead of int for loop counter

8 years agofix possible optimization bug
Anatol Belski [Tue, 5 Jul 2016 12:57:16 +0000 (14:57 +0200)]
fix possible optimization bug

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Tue, 5 Jul 2016 12:31:32 +0000 (14:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_compile.c

8 years agoDon't enforce LSP if prototype method is private
Pedro Magalhães [Thu, 30 Jun 2016 07:00:33 +0000 (09:00 +0200)]
Don't enforce LSP if prototype method is private

Fixes bug #72496.

8 years agofix typo
Anatol Belski [Tue, 5 Jul 2016 10:36:55 +0000 (12:36 +0200)]
fix typo

8 years agoprepare next version
Anatol Belski [Tue, 5 Jul 2016 06:09:20 +0000 (08:09 +0200)]
prepare next version

8 years agoadd missing NEWS entry
Anatol Belski [Mon, 4 Jul 2016 09:05:49 +0000 (11:05 +0200)]
add missing NEWS entry

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 4 Jul 2016 01:18:50 +0000 (03:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix typo in comment
Christoph M. Becker [Mon, 4 Jul 2016 01:17:17 +0000 (03:17 +0200)]
Fix typo in comment

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Sun, 3 Jul 2016 21:35:00 +0000 (23:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agothis was actually fixed in 5.6.23
Ferenc Kovacs [Sun, 3 Jul 2016 21:31:32 +0000 (23:31 +0200)]
this was actually fixed in 5.6.23

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Sun, 3 Jul 2016 15:57:42 +0000 (23:57 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  update NEWS
  extend test
  Fixed bug #72534 stream_socket_get_name crashes

8 years agoFixed bug #72538 (readline_redisplay crashes php)
Xinchen Hui [Sun, 3 Jul 2016 15:56:27 +0000 (23:56 +0800)]
Fixed bug #72538 (readline_redisplay crashes php)

8 years agoupdate NEWS
Anatol Belski [Sun, 3 Jul 2016 15:15:19 +0000 (17:15 +0200)]
update NEWS

8 years agoextend test
Anatol Belski [Sun, 3 Jul 2016 15:13:46 +0000 (17:13 +0200)]
extend test

8 years agoFixed bug #72534 stream_socket_get_name crashes
Anatol Belski [Sun, 3 Jul 2016 15:09:19 +0000 (17:09 +0200)]
Fixed bug #72534 stream_socket_get_name crashes

8 years agoFixed bug #72531 (ps_files_cleanup_dir Buffer overflow)
Xinchen Hui [Sun, 3 Jul 2016 01:30:33 +0000 (09:30 +0800)]
Fixed bug #72531 (ps_files_cleanup_dir Buffer overflow)

8 years agoupdate NEWS
Anatol Belski [Fri, 1 Jul 2016 16:44:20 +0000 (18:44 +0200)]
update NEWS

8 years agoFixed bug #72498 variant_date_from_timestamp null dereference
Anatol Belski [Fri, 1 Jul 2016 16:41:50 +0000 (18:41 +0200)]
Fixed bug #72498 variant_date_from_timestamp null dereference

8 years agoDon't use FUNC_ARG fetches for call_user_func()
Nikita Popov [Tue, 28 Jun 2016 19:34:20 +0000 (21:34 +0200)]
Don't use FUNC_ARG fetches for call_user_func()

This makes no sense -- SEND_USER can't even handle INDIRECTs.

8 years agoMake call_user_func() on reference args consistent
Nikita Popov [Tue, 28 Jun 2016 18:43:38 +0000 (20:43 +0200)]
Make call_user_func() on reference args consistent

Previously reference arguments were allowed if call_user_func()
was compiled to SEND_USER and not otherwise. Make it consistent
by always forbidding them.

8 years agoFixed test
Xinchen Hui [Tue, 28 Jun 2016 07:39:02 +0000 (15:39 +0800)]
Fixed test

8 years agoFixed bug #72508 (strange references after recursive function call and "switch" state...
Xinchen Hui [Tue, 28 Jun 2016 07:36:50 +0000 (15:36 +0800)]
Fixed bug #72508 (strange references after recursive function call and "switch" statement)

8 years agoMFH: Fixed fd leak (the origin commit can not be cherry-picked)
Xinchen Hui [Tue, 28 Jun 2016 03:32:41 +0000 (11:32 +0800)]
MFH: Fixed fd leak (the origin commit can not be cherry-picked)

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Tue, 28 Jun 2016 03:11:39 +0000 (11:11 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Fix the fix for #72403 on nl2br
  Update NEWS
  Update NEWS
  Fix #70628: Clearing bindings on an SQLite3 statement doesn't work
  5.5.38 now

8 years agoFixed bug #72505 (readfile() mangles files larger than 2G)
Xinchen Hui [Tue, 28 Jun 2016 03:11:25 +0000 (11:11 +0800)]
Fixed bug #72505 (readfile() mangles files larger than 2G)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 27 Jun 2016 19:32:58 +0000 (12:32 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
ext/standard/string.c

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
configure.in
main/php_version.h

8 years agoFix the fix for #72403 on nl2br
Stanislav Malyshev [Mon, 27 Jun 2016 19:30:42 +0000 (12:30 -0700)]
Fix the fix for #72403 on nl2br

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 27 Jun 2016 15:17:34 +0000 (17:17 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 27 Jun 2016 15:09:55 +0000 (17:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 27 Jun 2016 15:07:26 +0000 (17:07 +0200)]
Update NEWS

8 years agoFix #70628: Clearing bindings on an SQLite3 statement doesn't work
Christoph M. Becker [Mon, 27 Jun 2016 14:55:15 +0000 (16:55 +0200)]
Fix #70628: Clearing bindings on an SQLite3 statement doesn't work

Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but
also the bound_params of the php_sqlite3_stmt have to be cleared.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Lior Kaplan [Sat, 25 Jun 2016 18:32:38 +0000 (21:32 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add CVE info for PHP 5.6.22
  Add CVE info for PHP 5.6.23
  Add missing entries for PHP 5.6.23

8 years agoAlign NEWS files with 7.0.8 and Changelog
Lior Kaplan [Sat, 25 Jun 2016 18:25:57 +0000 (21:25 +0300)]
Align NEWS files with 7.0.8 and Changelog

8 years agoAdd CVE info for PHP 5.6.22
Lior Kaplan [Sat, 25 Jun 2016 17:31:26 +0000 (20:31 +0300)]
Add CVE info for PHP 5.6.22

8 years agoAdd CVE info for PHP 5.6.23
Lior Kaplan [Sat, 25 Jun 2016 17:28:51 +0000 (20:28 +0300)]
Add CVE info for PHP 5.6.23

8 years agoAdd missing entries for PHP 5.6.23
Lior Kaplan [Sat, 25 Jun 2016 16:56:00 +0000 (19:56 +0300)]
Add missing entries for PHP 5.6.23

8 years agoFixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php)
Xinchen Hui [Sat, 25 Jun 2016 01:08:16 +0000 (18:08 -0700)]
Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php)

8 years agoFixed format
Xinchen Hui [Fri, 24 Jun 2016 13:13:04 +0000 (21:13 +0800)]
Fixed format

8 years agoyet another test rewrite
Anatol Belski [Thu, 23 Jun 2016 07:42:17 +0000 (09:42 +0200)]
yet another test rewrite

8 years agoFixed bug #72476 (Memleak in jit_stack)
Xinchen Hui [Thu, 23 Jun 2016 06:06:48 +0000 (14:06 +0800)]
Fixed bug #72476 (Memleak in jit_stack)

8 years agoupdate NEWS
Anatol Belski [Wed, 22 Jun 2016 18:19:09 +0000 (20:19 +0200)]
update NEWS

8 years agorewrite test
Anatol Belski [Wed, 22 Jun 2016 17:46:02 +0000 (19:46 +0200)]
rewrite test

8 years agoFixed bug #72463 mail fails with invalid argument
Anatol Belski [Wed, 22 Jun 2016 17:05:31 +0000 (19:05 +0200)]
Fixed bug #72463 mail fails with invalid argument

8 years agoAllow "proxy" ovjects to substitute their class names through get_class_name() handle...
Dmitry Stogov [Wed, 22 Jun 2016 14:23:04 +0000 (17:23 +0300)]
Allow "proxy" ovjects to substitute their class names through get_class_name() handler (similar to var_dump() and others).

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 22 Jun 2016 10:22:03 +0000 (12:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test cleanup

8 years agofix test cleanup
Anatol Belski [Wed, 22 Jun 2016 10:20:02 +0000 (12:20 +0200)]
fix test cleanup

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 22 Jun 2016 09:44:14 +0000 (11:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix dir separator in test

8 years agofix dir separator in test
Anatol Belski [Wed, 22 Jun 2016 09:41:05 +0000 (11:41 +0200)]
fix dir separator in test

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 22 Jun 2016 01:08:10 +0000 (03:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0