]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.3'
Jakub Zelenka [Sun, 2 Sep 2018 19:03:03 +0000 (20:03 +0100)]
Merge branch 'PHP-7.3'

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 2 Sep 2018 19:02:09 +0000 (20:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix stream_security_level.phpt with OpenSSL 1.1.1
Jakub Zelenka [Sun, 2 Sep 2018 19:00:08 +0000 (20:00 +0100)]
Fix stream_security_level.phpt with OpenSSL 1.1.1

6 years agoRemove AC_HEADER_TIME
Peter Kokot [Sat, 1 Sep 2018 04:40:53 +0000 (06:40 +0200)]
Remove AC_HEADER_TIME

Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems anymore, including the `AC_HEADER_TIME`.

This macro checks if both `<sys/time.h>` and `<time.h>` can be included
at the same time and defines the `TIME_WITH_SYS_TIME` and
`HAVE_SYS_TIME_H` symbols. On current system such check is not relevant
anymore because in case both headers are present both can be also
included at the same time.

This patch simplifies this checking.

Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html

6 years agoRemove AC_C_CONST
Peter Kokot [Sat, 1 Sep 2018 02:18:46 +0000 (04:18 +0200)]
Remove AC_C_CONST

Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems, including the `AC_C_CONST`.

The `const` keyword is used in C since C89. On old systems some compilers
lacked the `const` and this macro defined it to be empty. This check was
relevant on systems with compilers before C89 and on current systems it
can be omitted. [2]

PHP also requires at least C89 so `const` is always available.

Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 1 Sep 2018 12:30:38 +0000 (14:30 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #75696: posix_getgrnam fails to print details of group

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 1 Sep 2018 12:29:26 +0000 (14:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #75696: posix_getgrnam fails to print details of group

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 1 Sep 2018 12:27:31 +0000 (14:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75696: posix_getgrnam fails to print details of group

6 years agoFix #75696: posix_getgrnam fails to print details of group
Christoph M. Becker [Fri, 24 Aug 2018 15:59:44 +0000 (17:59 +0200)]
Fix #75696: posix_getgrnam fails to print details of group

According to the POSIX specification of `getgrnam_r()` the result of
`sysconf(_SC_GETGR_R_SIZE_MAX)` is an initial value suggested for the
size of the buffer, and `ERANGE` signals that insufficient storage was
supplied.  So if we get `ERANGE`, we try again with a buffer twice as
big, and so on, instead of failing.

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Sat, 1 Sep 2018 09:34:08 +0000 (11:34 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update NEWS

6 years ago[ci skip] Update NEWS
Anatol Belski [Sat, 1 Sep 2018 09:33:39 +0000 (11:33 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Fri, 31 Aug 2018 23:12:45 +0000 (01:12 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Improve fix for bug #76829

6 years agoImprove fix for bug #76829
Anatol Belski [Fri, 31 Aug 2018 23:12:06 +0000 (01:12 +0200)]
Improve fix for bug #76829

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Fri, 31 Aug 2018 22:21:02 +0000 (00:21 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed bug #76829 Incorrect validation of domain on idn_to_utf8() function

6 years agoFixed bug #76829 Incorrect validation of domain on idn_to_utf8() function
Anatol Belski [Fri, 31 Aug 2018 22:14:23 +0000 (00:14 +0200)]
Fixed bug #76829 Incorrect validation of domain on idn_to_utf8() function

As stated by RFC 5890, U-Labels might be up to 252 Unicode code points
long. This can be fixed in 7.1+ as well, but there might potentially be
issues in some existing apps expecting the output to be max 255 octets
long. Thus it seems to be safer to not to touch stable branches.

6 years agoRevert changes in test file
Gabriel Caruso [Fri, 31 Aug 2018 11:39:18 +0000 (08:39 -0300)]
Revert changes in test file

This reverts changes made in 2f700384 and 4fcaebba. This test is
supposed to run
only on Windows indeed, as in a Unix environment with a mail server
configured,
an email will be send. On Windows, only emptying the SMTP ini directives
is enough.

6 years agoFix tests in some builds
Gabriel Caruso [Fri, 31 Aug 2018 11:09:14 +0000 (08:09 -0300)]
Fix tests in some builds

Looks like the EXPECTREGEX was eating the =DONE= section

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Thu, 30 Aug 2018 17:34:42 +0000 (19:34 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix stack underflow in phar

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 30 Aug 2018 17:34:23 +0000 (19:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix stack underflow in phar

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 30 Aug 2018 17:34:01 +0000 (19:34 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix stack underflow in phar

6 years agoFix stack underflow in phar
Anatol Belski [Mon, 6 Aug 2018 20:35:11 +0000 (22:35 +0200)]
Fix stack underflow in phar

The checks can issue reads below and above the temporary buffer. A read
itself doesn't seem dangerous, but the condition result can be
arbitrary. Such reads have to be avoided. Likely this patch should be
backported.

(cherry picked from commit b053beee7efb64b8e439fb3639de839e615ba89c)

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Thu, 30 Aug 2018 16:01:29 +0000 (18:01 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #76820: Z_COPYABLE invalid definition

6 years agoFix #76820: Z_COPYABLE invalid definition
Christoph M. Becker [Thu, 30 Aug 2018 16:00:51 +0000 (18:00 +0200)]
Fix #76820: Z_COPYABLE invalid definition

We remove the extraneous parenthesis.

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Thu, 30 Aug 2018 15:39:59 +0000 (17:39 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Switch to staging series on AppVeyor

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 30 Aug 2018 15:39:39 +0000 (17:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Switch to staging series on AppVeyor

6 years agoSwitch to staging series on AppVeyor
Anatol Belski [Thu, 30 Aug 2018 15:38:51 +0000 (17:38 +0200)]
Switch to staging series on AppVeyor

6 years agoMerge branch 'PHP-7.3'
Remi Collet [Thu, 30 Aug 2018 12:50:39 +0000 (14:50 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  NEWS for #76818

6 years agoNEWS for #76818
Remi Collet [Thu, 30 Aug 2018 12:50:26 +0000 (14:50 +0200)]
NEWS for #76818

6 years agoMerge branch 'PHP-7.3'
Remi Collet [Thu, 30 Aug 2018 07:05:01 +0000 (09:05 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  fix double cast to int on 32-bit

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Thu, 30 Aug 2018 07:04:43 +0000 (09:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix double cast to int on 32-bit

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Thu, 30 Aug 2018 07:04:13 +0000 (09:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix double cast to int on 32-bit

6 years agofix double cast to int on 32-bit
Remi Collet [Wed, 29 Aug 2018 07:10:59 +0000 (09:10 +0200)]
fix double cast to int on 32-bit

6 years agoMerge branch 'PHP-7.3'
Dmitry Stogov [Wed, 29 Aug 2018 20:41:46 +0000 (23:41 +0300)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Wed, 29 Aug 2018 20:41:22 +0000 (23:41 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 29 Aug 2018 20:41:14 +0000 (23:41 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoFixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal...
Dmitry Stogov [Wed, 29 Aug 2018 20:40:17 +0000 (23:40 +0300)]
Fixed incorrect ZEND_ACC_ARENA_ALLOCATED usage (it must be used only for internal functions).

6 years agoRemove AC_FUNC_VPRINTF
Peter Kokot [Wed, 29 Aug 2018 03:02:37 +0000 (05:02 +0200)]
Remove AC_FUNC_VPRINTF

Autoconf 2.59d (released in 2006) 1 started promoting several macros
as not relevant for newer systems anymore, including the AC_FUNC_VPRINTF.

This macro checks for presence of the vprint function otherwise checks
for presence of the _doprnt function. This check was relevant on very
old systems and today can be omitted since it should be well supported
by now. [2]

Also PHP doesn't use the HAVE_VPRINTF or HAVE_DOPRNT symbols.

Refs:
[1] http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
[2] https://www.gnu.org/software/autoconf/manual/autoconf-2.69/autoconf.html

6 years agoRemove AC_STRUCT_TM macro
Peter Kokot [Sun, 26 Aug 2018 04:21:04 +0000 (06:21 +0200)]
Remove AC_STRUCT_TM macro

Autoconf 2.59d (released in 2006) [1] started promoting several macros
as not relevant for newer systems anymore, including the `AC_STRUCT_TM`.

This macro checks if `struct tm` is defined in either `<sys/time.h>` or
`<time.h>` and defines the `TM_IN_SYS_TIME` symbol accordingly. This
check was relevant in times before the C89 for some embedded systems,
microcontrollers or very old systems. For newer systems it can be
avoided and the `<time.h>` should be included instead since current
systems should be well supported by now. [2]

Since PHP requires at least C89, this patch removes the obsolescent call
and time.h checks.

Refs:

- [1]: http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
- [2]: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Structures.html

6 years agoMake PHP development tools files and scripts executable
Peter Kokot [Wed, 29 Aug 2018 18:50:08 +0000 (20:50 +0200)]
Make PHP development tools files and scripts executable

This patch makes several scripts and PHP development tools files
executable and adds more proper shebangs to the PHP scripts.

The `#!/usr/bin/env php` shebang provides running the script via
`./script.php` and uses env to find PHP script location on the system.
At the same time it still provides running the script with a user
defined PHP location using `php script.php`.

6 years agoMerge branch 'PHP-7.3'
Sara Golemon [Wed, 29 Aug 2018 16:42:22 +0000 (12:42 -0400)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Prep for 7.1.23

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Sara Golemon [Wed, 29 Aug 2018 16:42:11 +0000 (12:42 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Prep for 7.1.23

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Wed, 29 Aug 2018 16:41:36 +0000 (12:41 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prep for 7.1.23

6 years agoPrep for 7.1.23
Sara Golemon [Wed, 29 Aug 2018 16:38:34 +0000 (12:38 -0400)]
Prep for 7.1.23

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Wed, 29 Aug 2018 14:12:39 +0000 (16:12 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS

6 years agoUpdate NEWS
Anatol Belski [Wed, 29 Aug 2018 14:12:18 +0000 (16:12 +0200)]
Update NEWS

6 years agoMerge branch 'PHP-7.3'
Remi Collet [Wed, 29 Aug 2018 12:41:27 +0000 (14:41 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Revert "Support fixed address mmap without replacement"
  Revert "Don't report mmap failure if it is expected"

6 years agoRevert "Support fixed address mmap without replacement"
Remi Collet [Wed, 29 Aug 2018 12:41:04 +0000 (14:41 +0200)]
Revert "Support fixed address mmap without replacement"

This reverts commit 0f68ff5c92924deb9401ce66458e67f250ccde74.

6 years agoRevert "Don't report mmap failure if it is expected"
Remi Collet [Wed, 29 Aug 2018 12:40:59 +0000 (14:40 +0200)]
Revert "Don't report mmap failure if it is expected"

This reverts commit 446b5b15d324dacd30f58313563a9d625fb54ac8.

6 years agoMake more tests run on Linux
Gabriel Caruso [Fri, 27 Jul 2018 00:12:21 +0000 (21:12 -0300)]
Make more tests run on Linux

6 years agoImplement #64517: Add AC_ARG_PROGRAM macro
Peter Kokot [Sat, 25 Aug 2018 18:52:28 +0000 (20:52 +0200)]
Implement #64517: Add AC_ARG_PROGRAM macro

The AC_ARG_PROGRAM Autoconf macro provides program name transformations
when installing. This patch implements #64517 and prepares the
implementation for the request #60518.

In ./configure --help it additionally outputs --program-prefix=PREFIX,
--program-suffix=SUFFIX and the upcoming --program-transform-name=PROGRAM
option.

Macro AC_ARG_PROGRAM is available since Autoconf 2.0 and needs to be
called after the AC_CANONICAL_TARGET macro.

Refs:
- https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Transforming-Names.html

6 years agoAllow opcache_compile_file() to perform compilation even if opcache is disabled.
Dmitry Stogov [Tue, 28 Aug 2018 21:42:38 +0000 (00:42 +0300)]
Allow opcache_compile_file() to perform compilation even if opcache is disabled.

6 years agoPerform run-time binding reusing HashTable bucket (without new bucket insertion).
Dmitry Stogov [Tue, 28 Aug 2018 21:35:07 +0000 (00:35 +0300)]
Perform run-time binding reusing HashTable bucket (without new bucket insertion).

6 years agoChange some permissions from 755 to 644
Peter Kokot [Sat, 25 Aug 2018 13:27:28 +0000 (15:27 +0200)]
Change some permissions from 755 to 644

This patch syncs file permissions accross the PHP source code files
since these don't need to be executable.

6 years agoAdded check for "user" method
Dmitry Stogov [Tue, 28 Aug 2018 20:56:12 +0000 (23:56 +0300)]
Added check for "user" method

6 years agoRemoved incorrect efree() (run_time_cache(s) are usually allocated in CG(arena)).
Dmitry Stogov [Tue, 28 Aug 2018 14:46:26 +0000 (17:46 +0300)]
Removed incorrect efree() (run_time_cache(s) are usually allocated in CG(arena)).

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Tue, 28 Aug 2018 13:43:34 +0000 (15:43 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed bug #76803 ftruncate changes file pointer

6 years agoFixed bug #76803 ftruncate changes file pointer
Anatol Belski [Tue, 28 Aug 2018 13:42:39 +0000 (15:42 +0200)]
Fixed bug #76803 ftruncate changes file pointer

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Tue, 28 Aug 2018 12:02:44 +0000 (14:02 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix SKIPIF conditions

6 years agoFix SKIPIF conditions
Christoph M. Becker [Tue, 28 Aug 2018 12:02:11 +0000 (14:02 +0200)]
Fix SKIPIF conditions

The test calls `mb_convert_encoding()` and as such requires the
mbstring extension.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Tue, 28 Aug 2018 10:24:07 +0000 (12:24 +0200)]
Merge branch 'PHP-7.3'

6 years ago[ci skip] Update NEWS wrt. php-7.3.0beta3 tagging
Christoph M. Becker [Tue, 28 Aug 2018 10:22:57 +0000 (12:22 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0beta3 tagging

6 years agoRevert "Removed redundand code"
Dmitry Stogov [Tue, 28 Aug 2018 08:51:08 +0000 (11:51 +0300)]
Revert "Removed redundand code"

This reverts commit 57e2b7d53b1d5de0a2eed6596faa9398b4dffc1c.

6 years agoMerge branch 'PHP-7.3'
Remi Collet [Tue, 28 Aug 2018 08:19:24 +0000 (10:19 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  bump to 7.2.11-dev

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 28 Aug 2018 08:19:08 +0000 (10:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump to 7.2.11-dev

6 years agobump to 7.2.11-dev
Remi Collet [Tue, 28 Aug 2018 08:17:33 +0000 (10:17 +0200)]
bump to 7.2.11-dev

6 years agoRemoved redundand code
Dmitry Stogov [Tue, 28 Aug 2018 08:03:17 +0000 (11:03 +0300)]
Removed redundand code

6 years agoMerge branch 'PHP-7.3'
Jakub Zelenka [Mon, 27 Aug 2018 14:53:13 +0000 (15:53 +0100)]
Merge branch 'PHP-7.3'

6 years agoStore zlog stream in each child so it can be reused
Jakub Zelenka [Mon, 27 Aug 2018 13:50:27 +0000 (14:50 +0100)]
Store zlog stream in each child so it can be reused

This change results in using the same buffer for multiple
stdio events which should fix inconsistencies of handling
messages that are not ended with a new line and possibly
very long messages that are split to multiple events.

6 years agoCleanup class linking
Dmitry Stogov [Mon, 27 Aug 2018 13:40:25 +0000 (16:40 +0300)]
Cleanup class linking

6 years agoMove zend_verify_abstract_class() into zend_inheritance.c
Dmitry Stogov [Mon, 27 Aug 2018 09:56:17 +0000 (12:56 +0300)]
Move zend_verify_abstract_class() into zend_inheritance.c

6 years agoAvoid function copying
Dmitry Stogov [Mon, 27 Aug 2018 09:47:32 +0000 (12:47 +0300)]
Avoid function copying

6 years agoRefactor stat implementation
Anatol Belski [Sun, 15 Jul 2018 07:33:14 +0000 (09:33 +0200)]
Refactor stat implementation

- move relevant parts into win32
- general cleanup
- use Windows API and fallback to POSIX
- improve filetime to timestamp conversion
- improve stat/fsat
- handle ino by using file index
- handle st_dev by using volume serial number

The inode implementation is based on file indexes from NTFS. On 32-bit,
fake inodes are shown, that may lead to unexpeted results. 64-bit
implementation is most reliable.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sun, 26 Aug 2018 11:24:36 +0000 (13:24 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #68180: iconv_mime_decode can return extra characters in a header

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sun, 26 Aug 2018 11:23:06 +0000 (13:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #68180: iconv_mime_decode can return extra characters in a header

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 26 Aug 2018 11:20:22 +0000 (13:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #68180: iconv_mime_decode can return extra characters in a header

6 years agoFix #68180: iconv_mime_decode can return extra characters in a header
Christoph M. Becker [Sun, 26 Aug 2018 10:59:17 +0000 (12:59 +0200)]
Fix #68180: iconv_mime_decode can return extra characters in a header

Basically, the algorithm to append a converted string to an existing
`smart_str` works by increasing the `smart_str` buffer, to let `iconv`
convert characters until there is no more space, to set the new length
of the `smart_str` and to repeat until there is no more input.

Formerly, the new length calculation has been wrong, though, since we
would have to take the old `out_len` into account (`buf_growth -
old_out_len - out_len`).  However, since there is no need to take the
old `out_len` into account when increasing the `smart_str` buffer, we
can simplify the fix, avoiding an additional variable.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 15:52:44 +0000 (17:52 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #60494: iconv_mime_decode does ignore special characters

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 15:49:39 +0000 (17:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #60494: iconv_mime_decode does ignore special characters

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 15:42:10 +0000 (17:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #60494: iconv_mime_decode does ignore special characters

6 years agoFix #60494: iconv_mime_decode does ignore special characters
Christoph M. Becker [Sat, 25 Aug 2018 13:41:44 +0000 (15:41 +0200)]
Fix #60494: iconv_mime_decode does ignore special characters

We must not ignore erroneous characters in mime headers, but rather let
iconv_mime_decode() fail in this case, issuing the usual notice
regarding illegal characters.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 12:54:52 +0000 (14:54 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #63839: iconv_mime_decode_headers function is skipping headers

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 12:53:56 +0000 (14:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #63839: iconv_mime_decode_headers function is skipping headers

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #63839: iconv_mime_decode_headers function is skipping headers

6 years agoFix #63839: iconv_mime_decode_headers function is skipping headers
Christoph M. Becker [Sun, 12 Aug 2018 21:20:41 +0000 (23:20 +0200)]
Fix #63839: iconv_mime_decode_headers function is skipping headers

We have to cater to the possibility that `=?` is not the start of an
encoded-word, but rather a literal `=?`.  If a line break is found
while we're still looking for the charset, we can safely assume that
it's a literal `=?`, and act accordingly.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 12:43:35 +0000 (14:43 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #55146: iconv_mime_decode_headers() skips some headers

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 25 Aug 2018 12:42:35 +0000 (14:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #55146: iconv_mime_decode_headers() skips some headers

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 25 Aug 2018 12:41:00 +0000 (14:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #55146: iconv_mime_decode_headers() skips some headers

6 years agoFix #55146: iconv_mime_decode_headers() skips some headers
Christoph M. Becker [Sun, 12 Aug 2018 17:55:09 +0000 (19:55 +0200)]
Fix #55146: iconv_mime_decode_headers() skips some headers

If we're expecting the start of an encoded word (`=?`), but instead of
the question mark get a line break (CR or LF), we must not append it to
the `pretval`.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 12:30:24 +0000 (14:30 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string

6 years agoFix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string
Christoph M. Becker [Sun, 12 Aug 2018 13:03:47 +0000 (15:03 +0200)]
Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string

The minimum length of an encoded-word is actually the pure encoding
overhead plus the length of the `output-charset` plus the minimum unit
of encoded text, which is 4 for B-encoding and (for simplicity) 3 for
Q-encoding.  We also cater to the possibility that we need further
encoded words, which would be split by the `line-break-chars` followed
by a space character.  Obviously, the former `out_charset_len + 12` is
too simplistic and wrong in the given case (where the magic number
would be 13).

These simplifications are somewhat wasteful, but iconv_mime_encode()
with Q-encoding is wasteful anyway (see bug 66828[1]), and the proper
solution to convert the whole input to the desired output charset
upfront, and applying the encoding afterwards appears too much a change
for the stable releases.

[1] <https://bugs.php.net/66828>

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 12:24:43 +0000 (14:24 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #76712: Assignment of empty string creates extraneous text node

6 years agoFix #76712: Assignment of empty string creates extraneous text node
Christoph M. Becker [Tue, 7 Aug 2018 09:37:58 +0000 (11:37 +0200)]
Fix #76712: Assignment of empty string creates extraneous text node

We work around this peculiarity of libxml by using xmlNodeSetContent(),
which does not exhibit this behavior.  This also saves us from manually
calculating the string length.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 25 Aug 2018 09:58:50 +0000 (11:58 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Remove some old parts of the php

6 years agoRemove some old parts of the php
Peter Kokot [Fri, 24 Aug 2018 18:07:43 +0000 (20:07 +0200)]
Remove some old parts of the php

Since ba138a3746b3077ebe5b7356b5b49f21cfc30438 the generate-phpt library
has been unbundled from the php-src. This patch cleans two remaining
parts.

6 years agoRemove Doxygen configuration
Peter Kokot [Sat, 25 Aug 2018 05:20:21 +0000 (07:20 +0200)]
Remove Doxygen configuration

Documentation for the SPL was once rendered at
http://www.php.net/~helly/php/ext/spl/

With upgrades of the PHP manual, the SPL documentation moved there
instead and PHP files for the SPL docs in the PHP source code directory
were outdated and removed via 9003d8a4cfe810b9222273a36b9be89dda94a35b

6 years agoReplace HAVE_ST_BLOCKS with HAVE_STRUCT_STAT_ST_BLOCKS
Peter Kokot [Thu, 23 Aug 2018 22:33:02 +0000 (00:33 +0200)]
Replace HAVE_ST_BLOCKS with HAVE_STRUCT_STAT_ST_BLOCKS

Since Autoconf 2.50+ macro AC_STRUCT_ST_BLOCKS defines the new
HAVE_STRUCT_STAT_ST_BLOCKS symbol and has deprecated the previous
HAVE_ST_BLOCKS.

PHP 5.3 required Autoconf 2.13 (released in 1999) or newer, since PHP
5.4 the autoconf 2.59 (released in 2003) or newer was required, and
since PHP 7.2, autoconf 2.64 (released in 2008) or newer is required.

6 years agoZEND_DECLARE_CLASS, ZEND_DECLARE_INHERITED_CLASS and ZEND_DECLARE_INHERITED_CLASS_DEL...
Dmitry Stogov [Fri, 24 Aug 2018 12:40:53 +0000 (15:40 +0300)]
ZEND_DECLARE_CLASS, ZEND_DECLARE_INHERITED_CLASS and ZEND_DECLARE_INHERITED_CLASS_DELAYED don't need return value anymore.

6 years agoPerform "early-binding" directly during compilation
Dmitry Stogov [Fri, 24 Aug 2018 12:18:38 +0000 (15:18 +0300)]
Perform "early-binding" directly during compilation

6 years agoKeep information about unresolved parent class in zend_class_entry->parent_name
Dmitry Stogov [Thu, 23 Aug 2018 21:20:57 +0000 (00:20 +0300)]
Keep information about unresolved parent class in zend_class_entry->parent_name

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Thu, 23 Aug 2018 19:28:08 +0000 (21:28 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  mkdist.php: recursively check dll dependencies