php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-30 03:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,787 Commits 549 Branches 1,487 Tags
b67eb3440bb244adf6957bf2c68aeeaa6efc8c8d
Commit Graph

43863 Commits

Author SHA1 Message Date
Joe Watkins bf914ff75a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix 00version.phpt when commit message has multiple lines.
 2017-01-26 11:36:36 +00:00
Mitch Hagstrand a3d3f76827 Fix 00version.phpt when commit message has multiple lines. 
The environment variable "TRAVIS_COMMIT_MESSAGE" can contain multiple lines.

An example can be seen here https://travis-ci.org/php/php-src/jobs/195465293
 2017-01-26 11:36:24 +00:00
Joe Watkins 2d339fa4d1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug
 2017-01-26 09:04:25 +00:00
andrewnester f65ae82c55 Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug 2017-01-26 09:03:47 +00:00
Joe Watkins 76a7470160 Fixed bug #73994 incorrect arginfo for unpack 2017-01-26 06:58:08 +00:00
Joe Watkins f6f2855ecd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes)
  Added (failing) testcase for bug #54382
 2017-01-25 20:59:37 +00:00
Arnout Boks 721a189742 Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes) 
The fix is based on the same strategy for handling namespace
declarations as used by getAttributeNode. Note that this strategy makes
these methods not return a DOMAttr for xmlns* attributes, but an
instance of the (undocumented) class DOMNameSpaceNode. This is not
really ideal, but at least this fix makes the behavior of
getAttributeNode and getAttributeNodeNS consistent.

A follow-up action would be to investigate whether DOMNameSpaceNode can
be made into a subclass of DOMAttr (which may be hard due to the way
libxml treats namespace declarations) or document this deviating return
value for xmlns* attributes.
 2017-01-25 20:59:25 +00:00
Arnout Boks 737ee0661c Added (failing) testcase for bug #54382 2017-01-25 20:59:23 +00:00
Jakub Zelenka 519b0dc886 Fix bug #73978 (openssl_decrypt triggers bug in PDO) 2017-01-25 19:55:05 +00:00
Anatol Belski ec78507bd4 dirname() should not normalize paths 
This is the BC piece with the case where dirname() is used with an URL.
 2017-01-24 17:56:00 +01:00
Christoph M. Becker 4af464a0df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add regression test for bug #47946
 2017-01-22 15:02:59 +01:00
Christoph M. Becker 71efe9d8fd Add regression test for bug #47946 
This bug had already been fixed, but apparently there's no regression
test yet, so we add one.

Note that the expected image has black pixel artifacts, which are
another issue (perhaps bug #40158), and would have to be adressed
separately.
 2017-01-22 15:01:01 +01:00
Joe Watkins 55393e26a5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix intermittent segfault in GD library
 2017-01-22 06:41:07 +00:00
Mitch Hagstrand e56fe7e5e7 Fix intermittent segfault in GD library 
The gdIOCtx struct should be zero filled with ecalloc.
emalloc does not zero fill the struct.
 2017-01-22 06:40:55 +00:00
Christoph M. Becker 7a2497b2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:18:54 +01:00
Christoph M. Becker f67d599a01 Fix #73968: Premature failing of XBM reading 
We must take into account the line padding, when we're reading XBM
files.

We deliberately ignore the potential integer overflow here, because
that would be caught by gdImageCreate() or even earlier if `bytes==0`,
what happens in libgd00094.phpt which we adapt accordingly.
 2017-01-21 13:04:36 +01:00
Joe Watkins 1ff27053f9 Fix bug #73961 environmental build dependency in hash sha3 source 2017-01-21 07:45:28 +00:00
Anatol Belski 95406c878a Fixed bug #73962 bug with symlink related to cyrillic directory 2017-01-20 23:45:08 +01:00
Joe Watkins d6feb2edbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:11:49 +00:00
andrewnester 21ac79e94b Fixed #73959 - lastInsertId fails to throw an exception in pdsql 2017-01-20 20:10:55 +00:00
Remi Collet 7ea7d3d829 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:46:24 +01:00
Remi Collet f81b7df618 Fixed bug #73965 DTrace reported as enabled when disabled 2017-01-20 17:45:15 +01:00
SjonHortensius 631861e1fa Update comment, incorrect since 224aaf94 
In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
 2017-01-19 10:48:54 +00:00
Xinchen Hui 5e09031144 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:23:56 +08:00
Xinchen Hui cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Joe Watkins 6d89640d55 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:23:59 +00:00
Joe Watkins f9226f9bf3 Fix bug #73949 leak in mysqli_fetch_object 2017-01-18 18:22:57 +00:00
Joe Watkins bce548d8e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
 2017-01-18 17:23:29 +00:00
Marcus Bointon 280e9cb28d DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850 2017-01-18 17:23:08 +00:00
Leigh 85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Remi Collet 2ce8a4cf87 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fix #73956 Link use CC instead of CXX
 2017-01-18 13:02:19 +01:00
Remi Collet 6af22d0d3e Fix #73956 Link use CC instead of CXX 2017-01-18 13:00:49 +01:00
Thomas Punt 9977bdf9b3 Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Joe Watkins 43612e9593 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix ce comparison
 2017-01-18 05:06:07 +00:00
Thomas Punt a22f181736 Fix ce comparison 2017-01-18 05:05:53 +00:00
Anatol Belski cea050b8da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:35:26 +01:00
Anatol Belski 5d07438cb3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:33:51 +01:00
Christoph M. Becker d2274b01cb Fix #73869: Signed Integer Overflow gd_io.c 
GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.

(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
 2017-01-17 09:30:58 +01:00
Christoph M. Becker f1b2afc9d9 Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx() 
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.

(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
 2017-01-17 09:30:43 +01:00
Xinchen Hui e180e45a18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
 2017-01-17 15:35:06 +08:00
Xinchen Hui b28c2e20ca Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache) 2017-01-17 15:34:19 +08:00
Stanislav Malyshev 05f2f730e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73648 - integer overflow in substr
 2017-01-16 12:14:03 -08:00
Stanislav Malyshev d1d002fc4d Fix bug #73648 - integer overflow in substr 2017-01-16 12:11:50 -08:00
Nikita Popov 29433f9fd5 Make unserialize() ref unwrapping compatible with 7.0 
Also fix output difference in merged test (unrelated).
 2017-01-16 14:25:58 +01:00
Nikita Popov 590ef15f6a Merge branch 'PHP-7.0' into PHP-7.1 2017-01-16 14:12:10 +01:00
Nikita Popov e0ca519a8b Merge branch 'PHP-5.6' into PHP-7.0 2017-01-16 14:11:41 +01:00
Nikita Popov 6477bb724e Add additional serialize tests for fixed bugs 
These have been fixed as a side-effect of the delayed __wakeup
patch.
 2017-01-16 13:24:13 +01:00
Stanislav Malyshev 34d6b63501 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73634 - grapheme_strpos illegal memory access
  Fix typo
 2017-01-16 01:18:50 -08:00