granicus.if.org Git

]> granicus.if.org Git - php/log

Bob Weinand [Thu, 13 Oct 2016 08:40:00 +0000 (10:40 +0200)]

Revert "Merge branch 'pull-request/2082' (get_class accidentally in PHP-7.1)"

This reverts commit b0cacee3031b9f8ae983db3a690707b0ed68f7f8, reversing
changes made to fcbfd9835de536ea5a487492da56dac548a096e1.

commit | commitdiff | tree

Anatol Belski [Thu, 13 Oct 2016 08:08:23 +0000 (10:08 +0200)]

fix test

commit | commitdiff | tree

Anatol Belski [Thu, 13 Oct 2016 08:08:10 +0000 (10:08 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
use already exported symbol
Revert "export symbol missing by phpdbg"

commit | commitdiff | tree

Anatol Belski [Thu, 13 Oct 2016 07:55:37 +0000 (09:55 +0200)]

use already exported symbol

commit | commitdiff | tree

Anatol Belski [Thu, 13 Oct 2016 07:50:32 +0000 (09:50 +0200)]

Revert "export symbol missing by phpdbg"

This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1.

Overseen strpprintf is there

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Oct 2016 06:26:15 +0000 (23:26 -0700)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Oct 2016 06:19:07 +0000 (23:19 -0700)]

Fix outlen for openssl function

Even though datalen can't be over int, outlen can.

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Oct 2016 06:08:30 +0000 (23:08 -0700)]

Syncronize with 5.6 - __toString should return ""

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Oct 2016 06:07:47 +0000 (23:07 -0700)]

Fix potential overflows in php_pcre_replace_impl

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 23:33:07 +0000 (01:33 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Clear FG(user_stream_current_filename) when bailing out
  Fix tests
  fix tsrm
  Fix bug #73284 - heap overflow in php_ereg_replace function
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  fix bug #73275 - crash in openssl_encrypt function
  Fix for #73240 - Write out of bounds at number_format
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73208 - another missing length check
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  Fixed bug #73174 - heap overflow in php_pcre_replace_impl
  Fix bug #73150: missing NULL check in dom_document_save_html
  Fix bug #73147: Use After Free in PHP7 unserialize()
  Fix bug #73082
  Fix bug #73073 - CachingIterator null dereference when convert to string

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 23:31:36 +0000 (01:31 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Clear FG(user_stream_current_filename) when bailing out
  Fix tests
  fix tsrm
  Fix bug #73284 - heap overflow in php_ereg_replace function
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  fix bug #73275 - crash in openssl_encrypt function
  Fix for #73240 - Write out of bounds at number_format
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73208 - another missing length check
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  Fixed bug #73174 - heap overflow in php_pcre_replace_impl
  Fix bug #73150: missing NULL check in dom_document_save_html
  Fix bug #73147: Use After Free in PHP7 unserialize()
  Fix bug #73082
  Fix bug #73073 - CachingIterator null dereference when convert to string

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 21:15:36 +0000 (23:15 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Keith Smiley [Mon, 27 Jun 2016 18:23:15 +0000 (14:23 -0400)]

Fixed bug #73237

If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 21:07:37 +0000 (23:07 +0200)]

fix another mistake

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 21:05:10 +0000 (23:05 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Mitch Hagstrand [Wed, 12 Oct 2016 01:18:59 +0000 (20:18 -0500)]

Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()

1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 20:57:41 +0000 (22:57 +0200)]

Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 20:54:32 +0000 (22:54 +0200)]

Update NEWS

Also add missing include.inc test file

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 20:43:01 +0000 (22:43 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 20:41:59 +0000 (22:41 +0200)]

Fix phpdbg tests after lineno change

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 20:26:28 +0000 (22:26 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Wed, 12 Oct 2016 20:16:20 +0000 (22:16 +0200)]

Fix line number of implicit return in pseudo-main scope

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 20:21:19 +0000 (22:21 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
export symbol missing by phpdbg

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 20:18:05 +0000 (22:18 +0200)]

export symbol missing by phpdbg

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 20:17:41 +0000 (22:17 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 20:16:11 +0000 (22:16 +0200)]

Fix accidental PHPDBG_ABI break

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 19:33:13 +0000 (21:33 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73189 - Memcpy negative size parameter php_resolve_path

commit | commitdiff | tree

Stanislav Malyshev [Thu, 29 Sep 2016 06:30:48 +0000 (23:30 -0700)]

Fix bug #73189 - Memcpy negative size parameter php_resolve_path

(cherry picked from commit da7e89cde880c66887caacd0a3eae7ecdacf9b2a)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 18:54:43 +0000 (20:54 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update len in fallback cases

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 18:52:46 +0000 (20:52 +0200)]

update len in fallback cases

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 18:21:27 +0000 (20:21 +0200)]

fix wrong merge

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 18:19:10 +0000 (20:19 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Wed, 12 Oct 2016 18:11:51 +0000 (20:11 +0200)]

Add stdin command and -s command line parameter to phpdbg

This allows reading the initial script file from stdin instead of being forced to put the script into a file in order to run it with phpdbg.
Especially important for programmatic execution of phpdbg.

Also adding tests/include_once.phpt and tests/set_exception_handler.phpt as I seem to have forgotten to git add them sometime long ago...

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 18:09:24 +0000 (20:09 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73190: memcpy negative parameter _bc_new_num_ex

commit | commitdiff | tree

Stanislav Malyshev [Mon, 3 Oct 2016 07:09:02 +0000 (00:09 -0700)]

Fix bug #73190: memcpy negative parameter _bc_new_num_ex

(cherry picked from commit 40e7baab3c90001beee4c8f0ed0ef79ad18ee0d6)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 17:28:15 +0000 (19:28 +0200)]

fix test

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 16:31:46 +0000 (18:31 +0200)]

finish 7.1 port

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 15:56:13 +0000 (17:56 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73147: Use After Free in PHP7 unserialize()

commit | commitdiff | tree

Stanislav Malyshev [Mon, 26 Sep 2016 02:53:59 +0000 (19:53 -0700)]

Fix bug #73147: Use After Free in PHP7 unserialize()

(cherry picked from commit 0e6fe3a4c96be2d3e88389a5776f878021b4c59f)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 15:13:23 +0000 (17:13 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix typo

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 15:12:38 +0000 (17:12 +0200)]

fix typo

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 14:14:58 +0000 (16:14 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Revert "Fix for #73240 - Write out of bounds at number_format"

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 14:11:32 +0000 (16:11 +0200)]

Revert "Fix for #73240 - Write out of bounds at number_format"

This reverts commit 01280f8deb837a61237a619cffa886d7f8c31963.

The fix is already merged by Stas.

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 14:06:11 +0000 (16:06 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  followup with #73276 merge
  fix test
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  Fix for #73240 - Write out of bounds at number_format
  avoid strlen
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73150: missing NULL check in dom_document_save_html
  Clear FG(user_stream_current_filename) when bailing out
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 14:03:35 +0000 (16:03 +0200)]

followup with #73276 merge

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 14:03:09 +0000 (16:03 +0200)]

fix test

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 20:37:47 +0000 (13:37 -0700)]

Fix bug #73276 - crash in openssl_random_pseudo_bytes function

(cherry picked from commit 85a22a0af0722ef3a8d49a056a0b2b18be1fb981)

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 20:30:52 +0000 (13:30 -0700)]

Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()

(cherry picked from commit 96a8cf8e1b5dc1b0c708bb5574e0d6727cc56d9e)

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 06:42:50 +0000 (23:42 -0700)]

Fix for #73240 - Write out of bounds at number_format

(cherry picked from commit 8259130b6bc752968856b352c9e7f8e03a8c0a8e)

commit | commitdiff | tree

Anatol Belski [Wed, 12 Oct 2016 11:28:23 +0000 (13:28 +0200)]

avoid strlen

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Oct 2016 05:40:09 +0000 (22:40 -0700)]

Bug #73218: add mitigation for ICU int overflow

(cherry picked from commit d946d102936525bc7dcd01f3827d0a6e0bb971b0)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Oct 2016 04:28:40 +0000 (21:28 -0700)]

Add more locale length checks, due to ICU bugs.

(cherry picked from commit d3eb58332af433982f1e2ae9095fb087974a95f2)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 26 Sep 2016 04:25:01 +0000 (21:25 -0700)]

Fix bug #73150: missing NULL check in dom_document_save_html

(cherry picked from commit 1c0e9126fbfb7fde3173347b7464237f56c38bfa)

commit | commitdiff | tree

Xinchen Hui [Wed, 12 Oct 2016 08:07:56 +0000 (16:07 +0800)]

Fixed bug #73288 (Segfault in __clone > Exception.toString > __get)

Actually this is caused by optimization(opcache)

commit | commitdiff | tree

Sara Golemon [Wed, 12 Oct 2016 04:14:25 +0000 (21:14 -0700)]

Clear FG(user_stream_current_filename) when bailing out

If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.

Catch the bailout, clear the variable, then continue bailing.

Closes https://bugs.php.net/bug.php?id=73188

commit | commitdiff | tree

Sara Golemon [Wed, 12 Oct 2016 04:35:10 +0000 (21:35 -0700)]

commit | commitdiff | tree

Sara Golemon [Wed, 12 Oct 2016 04:35:10 +0000 (21:35 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 23:46:51 +0000 (16:46 -0700)]

Merge branch 'PHP-7.0.12' into PHP-7.0

* PHP-7.0.12:
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 23:27:13 +0000 (16:27 -0700)]

Merge remote-tracking branch 'origin/PHP-7.0.12' into PHP-7.0.12

* origin/PHP-7.0.12: (99 commits)
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  set versions
  update NEWS
  Ignore potentially misleading dberr values
  update NEWS
  Fixed bug #73172 parse error: Invalid numeric literal
  Fix #53745: cgi.discard_path option is missing from php.ini
  update libs_versions.txt
  update libs_versions.txt
  Fixed bug #73156 (segfault on undefined function)
  Add an include path for freetype which is relevant for cmake builds
  Fix test_image_equals_file() wrt. palette images
  Fixed bug #73163
  Fix #73161: imagecreatefromgd2() may leak memory
  Fix #73159: imagegd2(): unrecognized formats may result in corrupted files
  Fix #73155: imagegd2() writes wrong chunk sizes on boundaries
  Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given
  Fix #73157: imagegd2() ignores 3rd param if 4 are given
  ...

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 23:26:35 +0000 (16:26 -0700)]

Merge branch 'PHP-5.6.27' into PHP-5.6

* PHP-5.6.27:
  Fix tests
  fix tsrm
  Fix bug #73284 - heap overflow in php_ereg_replace function
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  fix bug #73275 - crash in openssl_encrypt function
  Fix for #73240 - Write out of bounds at number_format
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73208 - another missing length check
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  Fixed bug #73174 - heap overflow in php_pcre_replace_impl
  Fix bug #73150: missing NULL check in dom_document_save_html
  Fix bug #73147: Use After Free in PHP7 unserialize()
  Fix bug #73082
  Fix bug #73073 - CachingIterator null dereference when convert to string

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 23:16:20 +0000 (16:16 -0700)]

Fix tests

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 21:39:16 +0000 (14:39 -0700)]

fix tsrm

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 21:14:43 +0000 (14:14 -0700)]

Fix bug #73284 - heap overflow in php_ereg_replace function

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 20:37:47 +0000 (13:37 -0700)]

Fix bug #73276 - crash in openssl_random_pseudo_bytes function

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 20:30:52 +0000 (13:30 -0700)]

Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 20:19:20 +0000 (13:19 -0700)]

fix bug #73275 - crash in openssl_encrypt function

commit | commitdiff | tree

Dmitry Stogov [Tue, 11 Oct 2016 12:43:23 +0000 (15:43 +0300)]

Fixed referencecounter inference rules

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:42:27 +0000 (11:42 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:41:45 +0000 (11:41 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:26:32 +0000 (11:26 +0200)]

set versions and release date

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:25:00 +0000 (11:25 +0200)]

sync NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:24:08 +0000 (11:24 +0200)]

Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"

This reverts commit 2d8ab51576695630a7471ff829cc5ea10becdc0f.

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:03:00 +0000 (11:03 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:01:55 +0000 (11:01 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 11 Oct 2016 09:00:52 +0000 (11:00 +0200)]

restore NEWS to the state before breach

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 06:42:50 +0000 (23:42 -0700)]

Fix for #73240 - Write out of bounds at number_format

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 06:42:50 +0000 (23:42 -0700)]

Fix for #73240 - Write out of bounds at number_format

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Oct 2016 05:54:29 +0000 (22:54 -0700)]

Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Oct 2016 22:58:30 +0000 (01:58 +0300)]

Fixed referencecounter inference rules

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 18:57:57 +0000 (20:57 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 18:57:23 +0000 (20:57 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 18:55:44 +0000 (20:55 +0200)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 14:04:09 +0000 (16:04 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add test for bug #73037

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 14:02:30 +0000 (16:02 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
add test for bug #73037

commit | commitdiff | tree

Anatol Belski [Mon, 10 Oct 2016 13:59:52 +0000 (15:59 +0200)]

add test for bug #73037

commit | commitdiff | tree

Joe Watkins [Mon, 10 Oct 2016 11:17:11 +0000 (12:17 +0100)]

Merge branch 'PHP-7.1' of https://github.com/php/php-src into PHP-7.1

commit | commitdiff | tree

Joe Watkins [Mon, 10 Oct 2016 11:14:26 +0000 (12:14 +0100)]

Merge branch 'pull-request/2082'

commit | commitdiff | tree

Danack [Mon, 10 Oct 2016 11:21:59 +0000 (12:21 +0100)]

Added news entry.

commit | commitdiff | tree

Anatol Belski [Sat, 8 Oct 2016 17:36:19 +0000 (19:36 +0200)]

add zend_bailout to cppcheck conf

commit | commitdiff | tree

Nikita Popov [Mon, 10 Oct 2016 10:21:25 +0000 (12:21 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Mon, 10 Oct 2016 10:20:51 +0000 (12:20 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Mon, 10 Oct 2016 10:17:40 +0000 (12:17 +0200)]

Fixed bug #73273

As well as a few other $_SESSION separation issues.

commit | commitdiff | tree

Christoph M. Becker [Mon, 10 Oct 2016 10:13:07 +0000 (12:13 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Mon, 10 Oct 2016 10:05:47 +0000 (12:05 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Mon, 10 Oct 2016 09:44:58 +0000 (11:44 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Christoph M. Becker [Mon, 10 Oct 2016 09:40:16 +0000 (11:40 +0200)]

Fix #73279: Integer overflow in gdImageScaleBilinearPalette()

The color components are supposed to be in range 0..255, so we must not
cast them to `signed char`, what can be the default for `char`.

Port of <https://github.com/libgd/libgd/commit/77c8d359>.

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Oct 2016 08:49:12 +0000 (11:49 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Removed deprecated flag
Fixed information about possible return value

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Oct 2016 08:48:29 +0000 (11:48 +0300)]

Removed deprecated flag

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Oct 2016 08:46:43 +0000 (11:46 +0300)]

Fixed information about possible return value

commit | commitdiff | tree

Christoph M. Becker [Sun, 9 Oct 2016 13:27:14 +0000 (15:27 +0200)]

Merge branch 'PHP-7.1'

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom