granicus.if.org Git

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

projects / php / log

commit | commitdiff | tree

Levi Morrison [Sat, 21 Jan 2017 17:11:23 +0000 (10:11 -0700)]

Remove trailing tabs

commit | commitdiff | tree

Christoph M. Becker [Sat, 21 Jan 2017 12:20:47 +0000 (13:20 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix #73968: Premature failing of XBM reading

commit | commitdiff | tree

Christoph M. Becker [Sat, 21 Jan 2017 12:10:54 +0000 (13:10 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix #73968: Premature failing of XBM reading

commit | commitdiff | tree

Christoph M. Becker [Sat, 21 Jan 2017 00:21:03 +0000 (01:21 +0100)]

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.

commit | commitdiff | tree

Joe Watkins [Sat, 21 Jan 2017 07:46:02 +0000 (07:46 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix bug #73961 environmental build dependency in hash sha3 source

commit | commitdiff | tree

Joe Watkins [Sat, 21 Jan 2017 07:45:28 +0000 (07:45 +0000)]

Fix bug #73961 environmental build dependency in hash sha3 source

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:59:07 +0000 (02:59 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:57:54 +0000 (02:57 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:56:15 +0000 (02:56 +0100)]

backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:20:52 +0000 (02:20 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
exclude debug code
ensure the string for conversion is \0 terminated and integrade additional path length check

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:17:06 +0000 (02:17 +0100)]

exclude debug code

commit | commitdiff | tree

Anatol Belski [Sat, 21 Jan 2017 01:11:24 +0000 (02:11 +0100)]

ensure the string for conversion is \0 terminated and integrade
additional path length check

commit | commitdiff | tree

Anatol Belski [Fri, 20 Jan 2017 22:47:12 +0000 (23:47 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73962 bug with symlink related to cyrillic directory

commit | commitdiff | tree

Anatol Belski [Fri, 20 Jan 2017 22:45:08 +0000 (23:45 +0100)]

Fixed bug #73962 bug with symlink related to cyrillic directory

commit | commitdiff | tree

Joe Watkins [Fri, 20 Jan 2017 20:12:03 +0000 (20:12 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed #73959 - lastInsertId fails to throw an exception in pdsql

commit | commitdiff | tree

Joe Watkins [Fri, 20 Jan 2017 20:11:26 +0000 (20:11 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed #73959 - lastInsertId fails to throw an exception in pdsql

commit | commitdiff | tree

andrewnester [Fri, 20 Jan 2017 18:39:45 +0000 (21:39 +0300)]

Fixed #73959 - lastInsertId fails to throw an exception in pdsql

commit | commitdiff | tree

Remi Collet [Fri, 20 Jan 2017 16:50:09 +0000 (17:50 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  NEWS
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled

commit | commitdiff | tree

Remi Collet [Fri, 20 Jan 2017 16:46:41 +0000 (17:46 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Fri, 20 Jan 2017 16:46:24 +0000 (17:46 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
NEWS
Fixed bug #73965 DTrace reported as enabled when disabled

commit | commitdiff | tree

Remi Collet [Fri, 20 Jan 2017 16:46:11 +0000 (17:46 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Fri, 20 Jan 2017 16:45:15 +0000 (17:45 +0100)]

Fixed bug #73965 DTrace reported as enabled when disabled

commit | commitdiff | tree

Dmitry Stogov [Fri, 20 Jan 2017 07:39:27 +0000 (10:39 +0300)]

Optimized extract(). Avoided double hash lookups and repeatable checks through loop splitting.

commit | commitdiff | tree

Joe Watkins [Thu, 19 Jan 2017 10:49:09 +0000 (10:49 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update comment, incorrect since 224aaf94

commit | commitdiff | tree

SjonHortensius [Thu, 19 Jan 2017 10:41:02 +0000 (11:41 +0100)]

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

commit | commitdiff | tree

Xinchen Hui [Thu, 19 Jan 2017 04:24:04 +0000 (12:24 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed another part in ldap (bug #73933)

commit | commitdiff | tree

Xinchen Hui [Thu, 19 Jan 2017 04:23:56 +0000 (12:23 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed another part in ldap (bug #73933)

commit | commitdiff | tree

Xinchen Hui [Thu, 19 Jan 2017 04:23:23 +0000 (12:23 +0800)]

Fixed another part in ldap (bug #73933)

commit | commitdiff | tree

Ferenc Kovacs [Thu, 19 Jan 2017 00:23:36 +0000 (01:23 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Ferenc Kovacs [Thu, 19 Jan 2017 00:22:10 +0000 (01:22 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Thu, 19 Jan 2017 00:20:57 +0000 (01:20 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Ferenc Kovacs [Thu, 19 Jan 2017 00:16:31 +0000 (01:16 +0100)]

update NEWS

commit | commitdiff | tree

Nikita Popov [Wed, 18 Jan 2017 20:20:07 +0000 (21:20 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Wed, 18 Jan 2017 20:20:00 +0000 (21:20 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Mitch Hagstrand [Tue, 17 Jan 2017 20:39:07 +0000 (12:39 -0800)]

Removing zmemcheck from .gdbinit

It doesn't seem to make sense anymore

commit | commitdiff | tree

Andrey Andreev [Mon, 16 Jan 2017 13:51:13 +0000 (15:51 +0200)]

Disallow non-crypto hashes in HMAC and PBKDF2

For this purpose add is_crypto flag to php_hash_ops.

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 18:24:14 +0000 (18:24 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix bug #73949 leak in mysqli_fetch_object

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 18:23:30 +0000 (18:23 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73949 leak in mysqli_fetch_object

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 18:22:57 +0000 (18:22 +0000)]

Fix bug #73949 leak in mysqli_fetch_object

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 17:46:35 +0000 (17:46 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Remove remnants of TSMRLS_* macro calls

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 17:46:11 +0000 (17:46 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Remove remnants of TSMRLS_* macro calls

commit | commitdiff | tree

Thomas Punt [Wed, 18 Jan 2017 09:48:23 +0000 (09:48 +0000)]

Remove remnants of TSMRLS_* macro calls

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 17:25:52 +0000 (17:25 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 17:23:29 +0000 (17:23 +0000)]

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

commit | commitdiff | tree

Marcus Bointon [Tue, 3 Jan 2017 22:32:22 +0000 (23:32 +0100)]

DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850

commit | commitdiff | tree

Leigh [Wed, 18 Jan 2017 15:04:19 +0000 (15:04 +0000)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Leigh [Wed, 18 Jan 2017 15:02:52 +0000 (15:02 +0000)]

Add php_openssl_store_errors to bailouts

commit | commitdiff | tree

Leigh [Wed, 18 Jan 2017 14:48:36 +0000 (14:48 +0000)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Leigh [Wed, 18 Jan 2017 14:47:49 +0000 (14:47 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Leigh [Wed, 18 Jan 2017 14:45:41 +0000 (14:45 +0000)]

Change free to OPENSSL_free

commit | commitdiff | tree

Remi Collet [Wed, 18 Jan 2017 12:02:51 +0000 (13:02 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  NEWS
  NEWS
  Fix #73956 Link use CC instead of CXX

commit | commitdiff | tree

Remi Collet [Wed, 18 Jan 2017 12:02:33 +0000 (13:02 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Wed, 18 Jan 2017 12:02:19 +0000 (13:02 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
NEWS
Fix #73956 Link use CC instead of CXX

commit | commitdiff | tree

Remi Collet [Wed, 18 Jan 2017 12:02:03 +0000 (13:02 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Wed, 18 Jan 2017 12:00:49 +0000 (13:00 +0100)]

Fix #73956 Link use CC instead of CXX

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 10:00:26 +0000 (10:00 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Remove more TSRMLS_CC macros

commit | commitdiff | tree

Thomas Punt [Wed, 18 Jan 2017 09:57:27 +0000 (09:57 +0000)]

Remove more TSRMLS_CC macros

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 05:06:59 +0000 (05:06 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix ce comparison

commit | commitdiff | tree

Joe Watkins [Wed, 18 Jan 2017 05:06:07 +0000 (05:06 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix ce comparison

commit | commitdiff | tree

Thomas Punt [Tue, 17 Jan 2017 18:10:33 +0000 (18:10 +0000)]

Fix ce comparison

commit | commitdiff | tree

Joe Watkins [Tue, 17 Jan 2017 20:33:57 +0000 (20:33 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
updates to release docs

commit | commitdiff | tree

Joe Watkins [Tue, 17 Jan 2017 20:33:44 +0000 (20:33 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
updates to release docs

commit | commitdiff | tree

Joe Watkins [Tue, 17 Jan 2017 20:33:25 +0000 (20:33 +0000)]

updates to release docs

commit | commitdiff | tree

Joe Watkins [Tue, 17 Jan 2017 17:08:08 +0000 (17:08 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixes in .gdbinit for ZE 3

commit | commitdiff | tree

Joe Watkins [Tue, 17 Jan 2017 17:07:53 +0000 (17:07 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixes in .gdbinit for ZE 3

commit | commitdiff | tree

Mitch Hagstrand [Tue, 17 Jan 2017 05:55:03 +0000 (21:55 -0800)]

Fixes in .gdbinit for ZE 3

1. Fixed print_pi function
2. Fixed printing properties in ____printzv_contents
3. Added optional max length parameter in ____print_str

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 09:59:56 +0000 (10:59 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
[ci skip] sync NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 09:57:56 +0000 (10:57 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
[ci skip] sync NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 09:54:53 +0000 (10:54 +0100)]

[ci skip] sync NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 09:10:12 +0000 (10:10 +0100)]

fix changed symbol

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 08:36:42 +0000 (09:36 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix #73869: Signed Integer Overflow gd_io.c
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 08:35:26 +0000 (09:35 +0100)]

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()

commit | commitdiff | tree

Anatol Belski [Tue, 17 Jan 2017 08:33:51 +0000 (09:33 +0100)]

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()

commit | commitdiff | tree

Christoph M. Becker [Sat, 17 Dec 2016 16:06:58 +0000 (17:06 +0100)]

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)

commit | commitdiff | tree

Christoph M. Becker [Tue, 16 Aug 2016 16:23:36 +0000 (18:23 +0200)]

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)

commit | commitdiff | tree

Dmitry Stogov [Tue, 17 Jan 2017 08:11:12 +0000 (11:11 +0300)]

Separate zend_fetch_static_property_address() into an inline function

commit | commitdiff | tree

Xinchen Hui [Tue, 17 Jan 2017 07:35:46 +0000 (15:35 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWS
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)

commit | commitdiff | tree

Xinchen Hui [Tue, 17 Jan 2017 07:35:29 +0000 (15:35 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Tue, 17 Jan 2017 07:35:06 +0000 (15:35 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)