]> granicus.if.org Git - php/log
php
9 years agoFix #70029: nodeValue of DOMElement list content of children nodes
Christoph M. Becker [Fri, 10 Jul 2015 11:42:09 +0000 (13:42 +0200)]
Fix #70029: nodeValue of DOMElement list content of children nodes

According to the W3C DOM Core Level 3 specification DOMElement::nodeValue is
supposed to yield null, but currently the DOM extension yield the result of
calling xmlNodeGetContent(), what is the concatenation of the values of the
children of the element. This patch fixes the non standard behavior.

9 years agoupdated NEWS
Christoph M. Becker [Fri, 4 Sep 2015 23:35:16 +0000 (01:35 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Fri, 4 Sep 2015 23:32:08 +0000 (01:32 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70001: Assigning to DOMNode::textContent does additional entity encoding

Resolved conflicts:
ext/dom/node.c

9 years agoupdated NEWS
Christoph M. Becker [Fri, 4 Sep 2015 23:27:59 +0000 (01:27 +0200)]
updated NEWS

9 years agoFix #70001: Assigning to DOMNode::textContent does additional entity encoding
Christoph M. Becker [Tue, 7 Jul 2015 12:55:00 +0000 (14:55 +0200)]
Fix #70001: Assigning to DOMNode::textContent does additional entity encoding

Assigning to DOMNode::textContent encodes entities, what does not match the
behavior of DOMText::__construct() and DOMDocument::createTextNode. This patch
changes the behavior of DOMNode::textContent in this regard.

9 years agoupdated NEWS
Christoph M. Becker [Fri, 4 Sep 2015 22:47:09 +0000 (00:47 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6'
Christoph M. Becker [Fri, 4 Sep 2015 22:43:41 +0000 (00:43 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70322: ZipArchive::close() doesn't indicate errors

9 years agoupdated NEWS
Christoph M. Becker [Fri, 4 Sep 2015 22:37:08 +0000 (00:37 +0200)]
updated NEWS

9 years agoFix #70322: ZipArchive::close() doesn't indicate errors
Christoph M. Becker [Fri, 21 Aug 2015 20:26:26 +0000 (22:26 +0200)]
Fix #70322: ZipArchive::close() doesn't indicate errors

If an archive can't be written, ZipArchive::close() nonetheless returns TRUE.
We fix the return value to properly return success, and additionally raise a
warning on failure.

9 years agoSimplify JSON constants registration
Jakub Zelenka [Fri, 4 Sep 2015 19:00:29 +0000 (20:00 +0100)]
Simplify JSON constants registration

9 years agoAdd my name to authors for previous refactoring
Jakub Zelenka [Fri, 4 Sep 2015 18:56:59 +0000 (19:56 +0100)]
Add my name to authors for previous refactoring

Related to jsond changes

9 years agoMove json_decode options macros bellow encode options
Jakub Zelenka [Fri, 4 Sep 2015 18:37:05 +0000 (19:37 +0100)]
Move json_decode options macros bellow encode options

9 years agojson: fix formating of PHP_JSON* option bitshifts
Ryan McCullagh [Fri, 4 Sep 2015 02:13:10 +0000 (21:13 -0500)]
json: fix formating of PHP_JSON* option bitshifts

9 years agoMerge branch 'pull-request/1497'
Kalle Sommer Nielsen [Fri, 4 Sep 2015 15:59:06 +0000 (17:59 +0200)]
Merge branch 'pull-request/1497'

9 years agoFix build on Windows
Kalle Sommer Nielsen [Fri, 4 Sep 2015 15:49:48 +0000 (17:49 +0200)]
Fix build on Windows

9 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Fri, 4 Sep 2015 14:35:15 +0000 (16:35 +0200)]
Merge remote-tracking branch 'origin/PHP-5.6'

9 years agoFix #70361: HTTP stream wrapper doesn't close keep-alive connections
Niklas Keller [Tue, 25 Aug 2015 18:07:20 +0000 (20:07 +0200)]
Fix #70361: HTTP stream wrapper doesn't close keep-alive connections

9 years agoadds missing tokens to list of semi-reserved words and regenerates test suite
Márcio Almada [Fri, 4 Sep 2015 03:45:49 +0000 (00:45 -0300)]
adds missing tokens to list of semi-reserved words and regenerates test suite

9 years agothese need to be exported for extensions that use json
Joe Watkins [Thu, 3 Sep 2015 18:28:34 +0000 (19:28 +0100)]
these need to be exported for extensions that use json

9 years agoprepare NEWS for next
Anatol Belski [Thu, 3 Sep 2015 17:04:39 +0000 (19:04 +0200)]
prepare NEWS for next

9 years agoAlign NEWS entries format
Lior Kaplan [Thu, 3 Sep 2015 16:49:07 +0000 (19:49 +0300)]
Align NEWS entries format

9 years agoAlign NEWS entries format
Lior Kaplan [Thu, 3 Sep 2015 16:46:41 +0000 (19:46 +0300)]
Align NEWS entries format

9 years agosync NEWS
Anatol Belski [Thu, 3 Sep 2015 16:25:14 +0000 (18:25 +0200)]
sync NEWS

9 years agoAdd missing variable from birdstep_commit() which got removed in e8fcd52ef
Lior Kaplan [Thu, 3 Sep 2015 15:46:07 +0000 (18:46 +0300)]
Add missing variable from birdstep_commit() which got removed in e8fcd52ef

9 years agoAlign NEWS entries format
Lior Kaplan [Thu, 3 Sep 2015 14:53:53 +0000 (17:53 +0300)]
Align NEWS entries format

9 years agoAdd CVE for #70140 (PHP 7.0.0 Beta 3)
Lior Kaplan [Thu, 3 Sep 2015 14:51:07 +0000 (17:51 +0300)]
Add CVE for #70140 (PHP 7.0.0 Beta 3)

9 years agoSeems master is not affected
Xinchen Hui [Thu, 3 Sep 2015 06:15:57 +0000 (23:15 -0700)]
Seems master is not affected

9 years agoWe should keep one refcount to resource
Xinchen Hui [Thu, 3 Sep 2015 05:14:48 +0000 (22:14 -0700)]
We should keep one refcount to resource

9 years agoFixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
Xinchen Hui [Thu, 3 Sep 2015 05:07:29 +0000 (22:07 -0700)]
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)

9 years agoFixed test
Xinchen Hui [Thu, 3 Sep 2015 04:59:36 +0000 (21:59 -0700)]
Fixed test

9 years agoPartially fix bug #67167 - Wrong return value...
Levi Morrison [Thu, 3 Sep 2015 00:23:26 +0000 (18:23 -0600)]
Partially fix bug #67167 - Wrong return value...

...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE

The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 2 Sep 2015 23:58:29 +0000 (01:58 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  move the phpdbg NEWS entry to the correct version

9 years agomove the phpdbg NEWS entry to the correct version
Ferenc Kovacs [Wed, 2 Sep 2015 23:58:13 +0000 (01:58 +0200)]
move the phpdbg NEWS entry to the correct version

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 2 Sep 2015 23:47:17 +0000 (01:47 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing news entries

9 years agoadd missing news entries
Ferenc Kovacs [Wed, 2 Sep 2015 23:46:38 +0000 (01:46 +0200)]
add missing news entries

9 years agoSkip if ext/filter isn't loaded
Levi Morrison [Wed, 2 Sep 2015 16:12:08 +0000 (10:12 -0600)]
Skip if ext/filter isn't loaded

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 2 Sep 2015 15:56:49 +0000 (17:56 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Merge branch 'PHP-5.6'
  bump version

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 2 Sep 2015 15:55:57 +0000 (17:55 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Merge branch 'PHP-5.6'
  bump version

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Julien Pauli [Wed, 2 Sep 2015 15:55:20 +0000 (17:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Merge branch 'PHP-5.6'
  bump version

Conflicts:
configure.in
main/php_version.h

9 years agoMerge branch 'PHP-5.6' PHP-5.4
Matteo Beccati [Sat, 29 Aug 2015 08:48:53 +0000 (10:48 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added missing skipif for phar+zlib test

9 years agoMerge branch 'PHP-5.6'
Julien Pauli [Wed, 2 Sep 2015 15:51:02 +0000 (17:51 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.5.30 next
  More fixes for bug #70219

Conflicts:
ext/pcre/php_pcre.c
ext/session/session.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 2 Sep 2015 15:42:00 +0000 (17:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.30 next

Conflicts:
configure.in
main/php_version.h

9 years ago5.5.30 next
Julien Pauli [Wed, 2 Sep 2015 15:40:56 +0000 (17:40 +0200)]
5.5.30 next

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 2 Sep 2015 15:36:43 +0000 (23:36 +0800)]
Merge branch 'master' of git.php.net:/php-src

9 years agoUse ZSTR_VAL
Xinchen Hui [Wed, 2 Sep 2015 15:36:13 +0000 (23:36 +0800)]
Use ZSTR_VAL

9 years agoMerge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src
Xinchen Hui [Wed, 2 Sep 2015 15:28:51 +0000 (23:28 +0800)]
Merge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src

9 years agofix dir separators in test
Anatol Belski [Wed, 2 Sep 2015 15:26:35 +0000 (17:26 +0200)]
fix dir separators in test

9 years agouse correct api
Anatol Belski [Wed, 2 Sep 2015 15:25:00 +0000 (17:25 +0200)]
use correct api

9 years agofix leak
Anatol Belski [Wed, 2 Sep 2015 15:20:24 +0000 (17:20 +0200)]
fix leak

9 years agocleanup an atavism
Anatol Belski [Mon, 31 Aug 2015 20:22:46 +0000 (22:22 +0200)]
cleanup an atavism

no DOS support here )

9 years agoadd overflow check
Anatol Belski [Mon, 31 Aug 2015 19:48:14 +0000 (21:48 +0200)]
add overflow check

9 years agoremove unnecessary macros
Anatol Belski [Mon, 31 Aug 2015 19:43:24 +0000 (21:43 +0200)]
remove unnecessary macros

9 years agoUse regular huge pages instead of anonymous if available.
Dmitry Stogov [Wed, 2 Sep 2015 12:55:41 +0000 (15:55 +0300)]
Use regular huge pages instead of anonymous if available.

9 years agoIntroduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV...
Dmitry Stogov [Wed, 2 Sep 2015 10:05:12 +0000 (13:05 +0300)]
Introduced additional check. Its miss might be the reason of bug #70392 (SIGSEGV during PHP shutdown)

9 years agoPrevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions).
Dmitry Stogov [Wed, 2 Sep 2015 10:03:31 +0000 (13:03 +0300)]
Prevent HashTable compaction below HT_MIN_SIZE (this may lead to hash collisions).

9 years agoTemporary add XFAILs, will fix soon
Stanislav Malyshev [Wed, 2 Sep 2015 08:23:40 +0000 (01:23 -0700)]
Temporary add XFAILs, will fix soon

9 years agofix memory leak
Stanislav Malyshev [Wed, 2 Sep 2015 08:21:47 +0000 (01:21 -0700)]
fix memory leak

9 years agoMerge remote-tracking branch 'origin/master'
Stanislav Malyshev [Wed, 2 Sep 2015 08:00:16 +0000 (01:00 -0700)]
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add test for ReflectionMethod::getPrototype_basic()
  Added two tests to check the main functionallity of recode extension
  Doubles are not refcounted
  Fix #32490: constructor of mysqli has wrong name

9 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Tue, 1 Sep 2015 19:40:10 +0000 (12:40 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6: (21 commits)
  fix unit tests
  update NEWS
  add NEWS for fixes
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  ...

Conflicts:
ext/exif/exif.c
ext/gmp/gmp.c
ext/pcre/php_pcre.c
ext/session/session.c
ext/session/tests/session_decode_variation3.phpt
ext/soap/soap.c
ext/spl/spl_observer.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c

9 years agoAdd CURLPIPE_* constants to properly expose HTTP/2 multiplexing
Davey Shafik [Wed, 2 Sep 2015 04:06:31 +0000 (16:06 +1200)]
Add CURLPIPE_* constants to properly expose HTTP/2 multiplexing

9 years agoAdd test for ReflectionMethod::getPrototype_basic()
marcosptf [Tue, 25 Aug 2015 04:22:42 +0000 (01:22 -0300)]
Add test for ReflectionMethod::getPrototype_basic()

9 years agoAdded two tests to check the main functionallity of recode extension
Daniel Persson [Tue, 1 Sep 2015 19:53:09 +0000 (21:53 +0200)]
Added two tests to check the main functionallity of recode extension

9 years agoDoubles are not refcounted
Hannes Magnusson [Tue, 1 Sep 2015 21:52:04 +0000 (14:52 -0700)]
Doubles are not refcounted

9 years agobump version
Stanislav Malyshev [Tue, 1 Sep 2015 20:12:16 +0000 (13:12 -0700)]
bump version

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 1 Sep 2015 19:51:48 +0000 (12:51 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  More fixes for bug #70219

9 years agoFix #32490: constructor of mysqli has wrong name
Christoph M. Becker [Tue, 1 Sep 2015 16:38:11 +0000 (18:38 +0200)]
Fix #32490: constructor of mysqli has wrong name

As of PHP 7 old style constructor names are deprecated, so we rename
mysqli::mysqli() to mysqli::__construct().

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 1 Sep 2015 19:24:14 +0000 (12:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix unit tests

9 years agoMerge branch 'PHP-5.5' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 19:24:06 +0000 (12:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.5.29

* PHP-5.5:
  fix unit tests

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 1 Sep 2015 19:23:55 +0000 (12:23 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix unit tests

9 years agofix unit tests
Stanislav Malyshev [Tue, 1 Sep 2015 19:23:22 +0000 (12:23 -0700)]
fix unit tests

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 1 Sep 2015 19:06:41 +0000 (12:06 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  add NEWS for fixes
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/zip/php_zip.c

9 years agoMerge branch '70284' into PHP-5.6
Stanislav Malyshev [Tue, 1 Sep 2015 19:05:02 +0000 (12:05 -0700)]
Merge branch '70284' into PHP-5.6

* 70284:
  Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP)

9 years agoMerge branch 'PHP-5.5' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 19:04:04 +0000 (12:04 -0700)]
Merge branch 'PHP-5.5' into PHP-5.5.29

* PHP-5.5:
  update NEWS
  add NEWS for fixes

9 years agoupdate NEWS
Stanislav Malyshev [Tue, 1 Sep 2015 19:03:48 +0000 (12:03 -0700)]
update NEWS

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 1 Sep 2015 19:00:30 +0000 (12:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add NEWS for fixes

9 years agoadd NEWS for fixes
Stanislav Malyshev [Tue, 1 Sep 2015 18:53:59 +0000 (11:53 -0700)]
add NEWS for fixes

9 years agoMerge branch 'PHP-5.5' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 18:43:27 +0000 (11:43 -0700)]
Merge branch 'PHP-5.5' into PHP-5.5.29

* PHP-5.5:
  Improve fix for #70172
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)

Conflicts:
ext/pcre/php_pcre.c

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Tue, 1 Sep 2015 18:42:19 +0000 (11:42 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
configure.in
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h

9 years agoMerge branch 'PHP-5.4.45' into PHP-5.4
Stanislav Malyshev [Tue, 1 Sep 2015 18:40:15 +0000 (11:40 -0700)]
Merge branch 'PHP-5.4.45' into PHP-5.4

* PHP-5.4.45:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782

9 years agoImprove fix for #70172
Stanislav Malyshev [Tue, 1 Sep 2015 18:38:15 +0000 (11:38 -0700)]
Improve fix for #70172

9 years agoFixed bug #70397 (Segmentation fault when using Closure::call and yield)
Bob Weinand [Tue, 1 Sep 2015 16:04:00 +0000 (18:04 +0200)]
Fixed bug #70397 (Segmentation fault when using Closure::call and yield)

9 years agofix for --enable-zend-signals and ZTS
Joe Watkins [Tue, 1 Sep 2015 15:51:40 +0000 (16:51 +0100)]
fix for --enable-zend-signals and ZTS
temporary fix to make queue size bigger in zend_signal while I work on it

9 years agoMerge branch 'master' of https://github.com/php/php-src
Joe Watkins [Tue, 1 Sep 2015 10:00:45 +0000 (11:00 +0100)]
Merge branch 'master' of https://github.com/php/php-src

9 years agoFixed possible caching with invalid key value
Dmitry Stogov [Tue, 1 Sep 2015 09:56:33 +0000 (12:56 +0300)]
Fixed possible caching with invalid key value

9 years agofix zend signal and tsrm compat zend-signal-zts
Joe Watkins [Tue, 1 Sep 2015 08:34:54 +0000 (09:34 +0100)]
fix zend signal and tsrm compat

9 years agoMerge branch 'PHP-5.4.45' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 08:17:12 +0000 (01:17 -0700)]
Merge branch 'PHP-5.4.45' into PHP-5.5.29

* PHP-5.4.45:
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases

9 years agoFix bug #70312 - HAVAL gives wrong hashes in specific cases
Stanislav Malyshev [Tue, 1 Sep 2015 08:16:30 +0000 (01:16 -0700)]
Fix bug #70312 - HAVAL gives wrong hashes in specific cases

9 years agoMerge branch 'PHP-5.4.45' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 07:59:55 +0000 (00:59 -0700)]
Merge branch 'PHP-5.4.45' into PHP-5.5.29

* PHP-5.4.45:
  fix test

9 years agofix test
Stanislav Malyshev [Tue, 1 Sep 2015 07:59:31 +0000 (00:59 -0700)]
fix test

9 years agoFixed one more problem related to bug #70187 (Notice: unserialize(): Unexpected end...
Dmitry Stogov [Tue, 1 Sep 2015 07:39:00 +0000 (10:39 +0300)]
Fixed one more problem related to bug #70187 (Notice: unserialize(): Unexpected end of serialized data)

9 years agoMerge branch 'PHP-5.4.45' into PHP-5.5.29
Stanislav Malyshev [Tue, 1 Sep 2015 07:28:39 +0000 (00:28 -0700)]
Merge branch 'PHP-5.4.45' into PHP-5.5.29

* PHP-5.4.45:
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)

Conflicts:
ext/pcre/php_pcre.c
ext/standard/var_unserializer.c

9 years agoadd test
Stanislav Malyshev [Tue, 1 Sep 2015 07:26:12 +0000 (00:26 -0700)]
add test

9 years agoFix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
Stanislav Malyshev [Tue, 1 Sep 2015 07:20:45 +0000 (00:20 -0700)]
Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList

9 years agoFix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
Stanislav Malyshev [Tue, 1 Sep 2015 07:14:15 +0000 (00:14 -0700)]
Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage

9 years agoFix bug #70172 - Use After Free Vulnerability in unserialize()
Stanislav Malyshev [Tue, 1 Sep 2015 04:28:11 +0000 (21:28 -0700)]
Fix bug #70172 - Use After Free Vulnerability in unserialize()

9 years agoFix bug #70388 - SOAP serialize_function_call() type confusion
Stanislav Malyshev [Tue, 1 Sep 2015 04:06:03 +0000 (21:06 -0700)]
Fix bug #70388 - SOAP serialize_function_call() type confusion

9 years agoAdded missing set of fcc->initialized flag.
Dmitry Stogov [Tue, 1 Sep 2015 00:15:50 +0000 (03:15 +0300)]
Added missing set of fcc->initialized flag.

9 years agoFix valgrind warning upon displaying lines from eval()ed code in phpdbg
Bob Weinand [Mon, 31 Aug 2015 21:42:15 +0000 (23:42 +0200)]
Fix valgrind warning upon displaying lines from eval()ed code in phpdbg

9 years agoEnsure proper data alignment
Dmitry Stogov [Mon, 31 Aug 2015 10:56:42 +0000 (13:56 +0300)]
Ensure proper data alignment

9 years agoAdd myself into list of authors of the most refactored files.
Dmitry Stogov [Mon, 31 Aug 2015 08:38:16 +0000 (11:38 +0300)]
Add myself into list of authors of the most refactored files.