]> granicus.if.org Git - php/log
php
7 years agoMerge branch 'PHP-7.2'
Remi Collet [Tue, 3 Oct 2017 04:42:48 +0000 (06:42 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  Fix Bug #75284 sha3 is not supported on bigendian machine
  NEWS

7 years agoNEWS
Remi Collet [Tue, 3 Oct 2017 04:42:39 +0000 (06:42 +0200)]
NEWS

7 years agoFix Bug #75284 sha3 is not supported on bigendian machine
Remi Collet [Fri, 29 Sep 2017 12:38:21 +0000 (14:38 +0200)]
Fix Bug #75284 sha3 is not supported on bigendian machine

7 years agoNEWS
Frank Denis [Mon, 2 Oct 2017 20:47:06 +0000 (22:47 +0200)]
NEWS

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Mon, 2 Oct 2017 20:32:22 +0000 (22:32 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: untab tests
  ext/sodium: import secretstream test
  ext/sodium: sodium_compare() is always available
  ext/sodium: fix funky indentation
  ext/sodium: move pwhash_scrypt() after pwhash()
  ext/sodium: checks for crypto_box_SEALBYTES are not required
  ext/sodium: explicitly include <string.h>
  ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
  ext/sodium: fix funky indent on zend_parse_parameters_throw() calls
  ext/sodium: import bindings for secretstream
  ext/sodium: add crypto_pwhash_str_needs_rehash()
  ext/sodium: +base64 codecs (timing-safe)
  ext/sodium: add arginfo definitions that will be required later
  ext/sodium: sort prototypes

7 years agoext/sodium: untab tests
Frank Denis [Mon, 2 Oct 2017 20:28:46 +0000 (22:28 +0200)]
ext/sodium: untab tests

7 years agoext/sodium: import secretstream test
Frank Denis [Mon, 2 Oct 2017 20:28:33 +0000 (22:28 +0200)]
ext/sodium: import secretstream test

7 years agoext/sodium: sodium_compare() is always available
Frank Denis [Mon, 2 Oct 2017 20:23:53 +0000 (22:23 +0200)]
ext/sodium: sodium_compare() is always available

7 years agoext/sodium: fix funky indentation
Frank Denis [Mon, 2 Oct 2017 20:22:22 +0000 (22:22 +0200)]
ext/sodium: fix funky indentation

7 years agoext/sodium: move pwhash_scrypt() after pwhash()
Frank Denis [Mon, 2 Oct 2017 20:19:55 +0000 (22:19 +0200)]
ext/sodium: move pwhash_scrypt() after pwhash()

7 years agoext/sodium: checks for crypto_box_SEALBYTES are not required
Frank Denis [Mon, 2 Oct 2017 20:11:29 +0000 (22:11 +0200)]
ext/sodium: checks for crypto_box_SEALBYTES are not required

7 years agoext/sodium: explicitly include <string.h>
Frank Denis [Mon, 2 Oct 2017 20:10:30 +0000 (22:10 +0200)]
ext/sodium: explicitly include <string.h>

7 years agoext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
Frank Denis [Mon, 2 Oct 2017 20:05:59 +0000 (22:05 +0200)]
ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw

7 years agoext/sodium: fix funky indent on zend_parse_parameters_throw() calls
Frank Denis [Mon, 2 Oct 2017 20:02:47 +0000 (22:02 +0200)]
ext/sodium: fix funky indent on zend_parse_parameters_throw() calls

7 years agoext/sodium: import bindings for secretstream
Frank Denis [Mon, 2 Oct 2017 19:59:51 +0000 (21:59 +0200)]
ext/sodium: import bindings for secretstream

7 years agoext/sodium: add crypto_pwhash_str_needs_rehash()
Frank Denis [Mon, 2 Oct 2017 19:54:50 +0000 (21:54 +0200)]
ext/sodium: add crypto_pwhash_str_needs_rehash()

Also properly define xchacha20poly1305_ietf_keygen()

7 years agoext/sodium: +base64 codecs (timing-safe)
Frank Denis [Mon, 2 Oct 2017 19:43:54 +0000 (21:43 +0200)]
ext/sodium: +base64 codecs (timing-safe)

7 years agoext/sodium: add arginfo definitions that will be required later
Frank Denis [Mon, 2 Oct 2017 19:40:38 +0000 (21:40 +0200)]
ext/sodium: add arginfo definitions that will be required later

Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8

7 years agoext/sodium: sort prototypes
Frank Denis [Mon, 2 Oct 2017 19:36:35 +0000 (21:36 +0200)]
ext/sodium: sort prototypes

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Mon, 2 Oct 2017 09:27:09 +0000 (11:27 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  Fixed bug #75303 sha3 hangs on bigendian

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Mon, 2 Oct 2017 09:26:46 +0000 (11:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  NEWS
  Fixed bug #75303 sha3 hangs on bigendian

7 years agoNEWS
Remi Collet [Mon, 2 Oct 2017 09:26:08 +0000 (11:26 +0200)]
NEWS

7 years agoFixed bug #75303 sha3 hangs on bigendian
Remi Collet [Mon, 2 Oct 2017 09:25:23 +0000 (11:25 +0200)]
Fixed bug #75303 sha3 hangs on bigendian

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Mon, 2 Oct 2017 01:38:55 +0000 (21:38 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Guard against AI_NUMERICSERV not being defined.

7 years agoGuard against AI_NUMERICSERV not being defined.
Sara Golemon [Mon, 2 Oct 2017 01:32:06 +0000 (21:32 -0400)]
Guard against AI_NUMERICSERV not being defined.

7 years agoGuard against AI_NUMERICSERV not being defined.
Sara Golemon [Mon, 2 Oct 2017 01:32:06 +0000 (21:32 -0400)]
Guard against AI_NUMERICSERV not being defined.

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Sun, 1 Oct 2017 14:01:25 +0000 (16:01 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: fix pwhash_argon2i test

7 years agoext/sodium: fix pwhash_argon2i test
Frank Denis [Sun, 1 Oct 2017 14:00:41 +0000 (16:00 +0200)]
ext/sodium: fix pwhash_argon2i test

7 years agoMerge branch 'patch-experimental' of https://github.com/petk/php-src
Xinchen Hui [Sat, 30 Sep 2017 04:24:39 +0000 (12:24 +0800)]
Merge branch 'patch-experimental' of https://github.com/petk/php-src

* 'patch-experimental' of https://github.com/petk/php-src:
  Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions

7 years agoMerge branch 'patch-mysqli-todo' of https://github.com/petk/php-src
Xinchen Hui [Sat, 30 Sep 2017 04:23:14 +0000 (12:23 +0800)]
Merge branch 'patch-mysqli-todo' of https://github.com/petk/php-src

* 'patch-mysqli-todo' of https://github.com/petk/php-src:
  Remove done and old TODO file from ext/mysqli

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sat, 30 Sep 2017 04:16:05 +0000 (12:16 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #75279

Conflicts:
ext/standard/dl.c

7 years agoMerge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2
Xinchen Hui [Sat, 30 Sep 2017 04:14:21 +0000 (12:14 +0800)]
Merge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2

* 'patch-compile-warning' of https://github.com/petk/php-src:
  Fix bug #75279

7 years agoRemove done and old TODO file from ext/mysqli
Peter Kokot [Sat, 30 Sep 2017 01:23:28 +0000 (03:23 +0200)]
Remove done and old TODO file from ext/mysqli

Since PHP documentation and ini settings should be updated for the
mysqli extension, this patch removes an old and done TODO file from
ext/mysqli folder.

7 years agoRemove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions
Peter Kokot [Fri, 29 Sep 2017 23:58:08 +0000 (01:58 +0200)]
Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions

7 years agoMerge branch 'PHP-7.2'
Andrea Faulds [Fri, 29 Sep 2017 20:39:26 +0000 (21:39 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Andrea Faulds [Fri, 29 Sep 2017 20:38:52 +0000 (21:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Fri, 29 Sep 2017 20:38:30 +0000 (21:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix bug #75290
Andrea Faulds [Fri, 29 Sep 2017 20:38:08 +0000 (21:38 +0100)]
Fix bug #75290

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Fri, 29 Sep 2017 13:50:49 +0000 (15:50 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  Fixed bug #75285i Broken build when system libpcre don't have jit support

7 years agoNEWS
Remi Collet [Fri, 29 Sep 2017 13:50:38 +0000 (15:50 +0200)]
NEWS

7 years agoFixed bug #75285i Broken build when system libpcre don't have jit support
Remi Collet [Fri, 29 Sep 2017 13:47:50 +0000 (15:47 +0200)]
Fixed bug #75285i Broken build when system libpcre don't have jit support

Detect JIT support in system library,
So --with-pcre-jit is only for bundled library.

7 years agoFix bug #75279
Peter Kokot [Fri, 29 Sep 2017 01:06:16 +0000 (03:06 +0200)]
Fix bug #75279

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 29 Sep 2017 10:26:31 +0000 (12:26 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Revert --with-pcre-valgrind by default in debug build

7 years agoRevert --with-pcre-valgrind by default in debug build
Anatol Belski [Fri, 29 Sep 2017 10:16:47 +0000 (12:16 +0200)]
Revert --with-pcre-valgrind by default in debug build

After quite a few people reported this option enabled to be in many cases
not handy by default, it's reverted to no by default everywhere. If enabled,
it requires Valgrind dev packages, where just a few have Valgrind itself
installed or care. Still for PCRE related work this option is a must,
though will have to be turned on by hand.

Revert "fix default args for --with-pcre-valgrind"

This reverts commit 24de0fe9f4f92178adba27e2f1353e97a956b4a8.

Revert "Enable valgrind support for PCRE by default in debug builds"

This reverts commit 850bb998d9664e849ed743ea031dd0ee2a64cc9d.

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Fri, 29 Sep 2017 03:18:13 +0000 (11:18 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75267 (possible &/&& mixup)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Fri, 29 Sep 2017 03:17:07 +0000 (11:17 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75267 (possible &/&& mixup)

7 years agoFixed bug #75267 (possible &/&& mixup)
Xinchen Hui [Fri, 29 Sep 2017 03:16:32 +0000 (11:16 +0800)]
Fixed bug #75267 (possible &/&& mixup)

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Thu, 28 Sep 2017 14:48:53 +0000 (10:48 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix word alignment on ILP64.

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Thu, 28 Sep 2017 14:48:43 +0000 (10:48 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix word alignment on ILP64.

7 years agoFix word alignment on ILP64.
Sara Golemon [Thu, 28 Sep 2017 14:45:51 +0000 (10:45 -0400)]
Fix word alignment on ILP64.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 28 Sep 2017 13:45:47 +0000 (15:45 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Apply upstream patch for CVE-2016-1283

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 28 Sep 2017 13:45:09 +0000 (15:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Apply upstream patch for CVE-2016-1283

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 28 Sep 2017 13:44:40 +0000 (15:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Apply upstream patch for CVE-2016-1283

7 years agoApply upstream patch for CVE-2016-1283
Anatol Belski [Thu, 28 Sep 2017 13:40:49 +0000 (15:40 +0200)]
Apply upstream patch for CVE-2016-1283

Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 28 Sep 2017 11:20:09 +0000 (13:20 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix mkdir() special case for path length < 260 and > 248

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 28 Sep 2017 11:19:48 +0000 (13:19 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix mkdir() special case for path length < 260 and > 248

7 years agoFix mkdir() special case for path length < 260 and > 248
Anatol Belski [Thu, 28 Sep 2017 11:18:31 +0000 (13:18 +0200)]
Fix mkdir() special case for path length < 260 and > 248

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Wed, 27 Sep 2017 15:18:57 +0000 (17:18 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] hash_hmac_algos() is new in PHP 7.2.0

7 years ago[ci skip] hash_hmac_algos() is new in PHP 7.2.0
Christoph M. Becker [Wed, 27 Sep 2017 15:18:10 +0000 (17:18 +0200)]
[ci skip] hash_hmac_algos() is new in PHP 7.2.0

7 years agoUpdated NEWS
Côme Chilliet [Wed, 27 Sep 2017 15:11:27 +0000 (17:11 +0200)]
Updated NEWS

Added LDAP control support in it

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Wed, 27 Sep 2017 14:18:17 +0000 (17:18 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75255 (Request hangs and not finish)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 27 Sep 2017 14:17:46 +0000 (17:17 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75255 (Request hangs and not finish)

7 years agoFixed bug #75255 (Request hangs and not finish)
Dmitry Stogov [Wed, 27 Sep 2017 14:16:24 +0000 (17:16 +0300)]
Fixed bug #75255 (Request hangs and not finish)

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:23:52 +0000 (06:23 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix bug #75222 DateInterval microseconds property always 0

7 years agofix bug #75222 DateInterval microseconds property always 0
jhdxr [Mon, 25 Sep 2017 18:51:33 +0000 (02:51 +0800)]
fix bug #75222 DateInterval microseconds property always 0

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:21:02 +0000 (06:21 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:20:46 +0000 (06:20 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:20:34 +0000 (06:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled

7 years agoFix CGI m4 config message when CGI is disabled
Peter Kokot [Sun, 24 Sep 2017 19:09:09 +0000 (21:09 +0200)]
Fix CGI m4 config message when CGI is disabled

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:16:24 +0000 (06:16 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:15:59 +0000 (06:15 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:15:26 +0000 (06:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75248 and #75251

7 years agoFix bug #75248 and #75251
Peter Kokot [Fri, 22 Sep 2017 20:41:51 +0000 (22:41 +0200)]
Fix bug #75248 and #75251

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 27 Sep 2017 05:09:08 +0000 (06:09 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 27 Sep 2017 05:08:13 +0000 (06:08 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Wed, 27 Sep 2017 05:07:46 +0000 (06:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent

7 years agoFixed #75220 - Segfault when calling is_callable on parent
Nester [Mon, 18 Sep 2017 08:19:47 +0000 (08:19 +0000)]
Fixed #75220 - Segfault when calling is_callable on parent

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Tue, 26 Sep 2017 16:10:37 +0000 (18:10 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: call crypto_pwhash_argon2id() explicitly if required
  ext/sodium: avoid tautological comparisons

7 years agoext/sodium: call crypto_pwhash_argon2id() explicitly if required
Frank Denis [Tue, 26 Sep 2017 16:09:00 +0000 (18:09 +0200)]
ext/sodium: call crypto_pwhash_argon2id() explicitly if required

7 years agoext/sodium: avoid tautological comparisons
Frank Denis [Tue, 26 Sep 2017 15:58:16 +0000 (17:58 +0200)]
ext/sodium: avoid tautological comparisons

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Tue, 26 Sep 2017 15:38:09 +0000 (17:38 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: signing empty messages is fine

7 years agoext/sodium: signing empty messages is fine
Frank Denis [Tue, 26 Sep 2017 15:37:04 +0000 (17:37 +0200)]
ext/sodium: signing empty messages is fine

7 years agoSplit CFG after RECV independently from ZEND_ACC_HAS_TYPE_HINTS flag.
Dmitry Stogov [Tue, 26 Sep 2017 12:40:29 +0000 (15:40 +0300)]
Split CFG after RECV independently from ZEND_ACC_HAS_TYPE_HINTS flag.

7 years agoUpdate NEWS for 7.2.0RC4
Remi Collet [Tue, 26 Sep 2017 09:38:23 +0000 (09:38 +0000)]
Update NEWS for 7.2.0RC4

7 years agoUpdate NEWS for PHP 7.2.0RC3
Remi Collet [Tue, 26 Sep 2017 09:23:07 +0000 (09:23 +0000)]
Update NEWS for PHP 7.2.0RC3

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Tue, 26 Sep 2017 07:21:16 +0000 (09:21 +0200)]
Merge branch 'PHP-7.2'

7 years agoCreate $http_response_header even if not used
Nikita Popov [Tue, 26 Sep 2017 07:20:43 +0000 (09:20 +0200)]
Create $http_response_header even if not used

Extensions are relying on it.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Mon, 25 Sep 2017 22:47:09 +0000 (00:47 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd

7 years agoMerge branch 'pull-request/2773' into PHP-7.2
Christoph M. Becker [Mon, 25 Sep 2017 22:36:54 +0000 (00:36 +0200)]
Merge branch 'pull-request/2773' into PHP-7.2

* pull-request/2773:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 25 Sep 2017 19:59:09 +0000 (21:59 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 25 Sep 2017 19:58:41 +0000 (21:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 25 Sep 2017 19:58:18 +0000 (21:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoRemove some old sapi/apache_hooks and sapi/apache leftovers
Peter Kokot [Sun, 24 Sep 2017 22:23:59 +0000 (00:23 +0200)]
Remove some old sapi/apache_hooks and sapi/apache leftovers

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 25 Sep 2017 09:23:11 +0000 (12:23 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Added missed ~

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 25 Sep 2017 09:23:01 +0000 (12:23 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Added missed ~

7 years agoAdded missed ~
Dmitry Stogov [Mon, 25 Sep 2017 09:22:35 +0000 (12:22 +0300)]
Added missed ~

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 25 Sep 2017 09:05:24 +0000 (12:05 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed type inference

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 25 Sep 2017 09:04:13 +0000 (12:04 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed type inference

7 years agoFixed type inference
Dmitry Stogov [Mon, 25 Sep 2017 09:03:47 +0000 (12:03 +0300)]
Fixed type inference

7 years agoFix PHP_GD_TTSTR: command not found warning in ext/gd
Peter Kokot [Mon, 25 Sep 2017 00:37:42 +0000 (02:37 +0200)]
Fix PHP_GD_TTSTR: command not found warning in ext/gd