]> granicus.if.org Git - php/log
php
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

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

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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 23 Aug 2018 19:26:40 +0000 (21:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

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

6 years agomkdist.php: recursively check dll dependencies
Dylan K. Taylor [Tue, 21 Aug 2018 14:23:02 +0000 (15:23 +0100)]
mkdist.php: recursively check dll dependencies

Fix duplication of recursively checked deps

6 years agoKeep information about unresolved interfaces in zend_class_entry->interface_names.
Dmitry Stogov [Thu, 23 Aug 2018 14:16:28 +0000 (17:16 +0300)]
Keep information about unresolved interfaces in  zend_class_entry->interface_names.
Move interface implementation code into ZEND_DECLARE_*CLASS opcodes.
Remove ZEND_ADD_INTERFACE and ZEND_VERIFY_ABSTRACT_CLASS opcodes.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Thu, 23 Aug 2018 10:52:31 +0000 (12:52 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Simplify regression test

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 23 Aug 2018 10:51:11 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Simplify regression test

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Thu, 23 Aug 2018 10:49:26 +0000 (12:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Simplify regression test

6 years agoSimplify regression test
Christoph M. Becker [Thu, 23 Aug 2018 10:44:06 +0000 (12:44 +0200)]
Simplify regression test

There's no need to actually try to trigger an out-of-memory condition
to proof the leak; instead we can simply rely on the Zend MM to report
the memory leaks in debug mode (at least on Linux).  Therefore we
simplify the regression test, which also makes it run much faster.

6 years agoReplace zend_class_entry->traits by persistent zend_class_entry->trait_names.
Dmitry Stogov [Wed, 22 Aug 2018 23:02:26 +0000 (02:02 +0300)]
Replace zend_class_entry->traits by persistent zend_class_entry->trait_names.
Move trait binding code into ZEND_DECLARE_*CLASS opcodes.
Remove ZEND_ADD_TRIAIT and ZEND_BIND_TRAITS opcodes.

6 years agoChange zend_lookup_class_ex() and zend_fetch_class_by_name() prototypes to accept...
Dmitry Stogov [Wed, 22 Aug 2018 14:07:31 +0000 (17:07 +0300)]
Change zend_lookup_class_ex() and zend_fetch_class_by_name() prototypes to accept optional lower-case class name as zend_string*, instead of zval*.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 13:40:26 +0000 (15:40 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 Aug 2018 13:39:34 +0000 (15:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 22 Aug 2018 13:38:02 +0000 (15:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()

6 years agoFix #68825: Exception in DirectoryIterator::getLinkTarget()
Christoph M. Becker [Sun, 19 Aug 2018 12:03:47 +0000 (14:03 +0200)]
Fix #68825: Exception in DirectoryIterator::getLinkTarget()

intern->file_name may not have been properly set when
DirectoryIterator::getLinkTarget() is called, so we make sure it is
before using it.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 12:32:04 +0000 (14:32 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Increase memory_limit to prevent test failures

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 Aug 2018 12:31:36 +0000 (14:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Increase memory_limit to prevent test failures

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 22 Aug 2018 12:30:23 +0000 (14:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Increase memory_limit to prevent test failures

6 years agoIncrease memory_limit to prevent test failures
Christoph M. Becker [Wed, 22 Aug 2018 12:29:28 +0000 (14:29 +0200)]
Increase memory_limit to prevent test failures

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 12:08:46 +0000 (14:08 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #76773 - Methods with a concrete scope need to be added again

6 years agoFix #76773 - Methods with a concrete scope need to be added again
Chris Wright [Tue, 21 Aug 2018 16:40:06 +0000 (17:40 +0100)]
Fix #76773 - Methods with a concrete scope need to be added again

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 11:57:44 +0000 (13:57 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #76767: ‘asm’ operand has impossible constraints in zend_operators.h

6 years agoFix #76767: ‘asm’ operand has impossible constraints in zend_operators.h
Ondřej Surý [Mon, 20 Aug 2018 08:06:53 +0000 (08:06 +0000)]
Fix #76767: ‘asm’ operand has impossible constraints in zend_operators.h

We disable assembly code with gcc 4.8 on i386.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 11:51:55 +0000 (13:51 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #76778: array_reduce leaks memory if callback throws exception

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 Aug 2018 11:50:46 +0000 (13:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #76778: array_reduce leaks memory if callback throws exception

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

* PHP-7.1:
  Fix #76778: array_reduce leaks memory if callback throws exception

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Wed, 22 Aug 2018 11:43:52 +0000 (13:43 +0200)]
Merge branch 'PHP-7.3'

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 Aug 2018 11:39:33 +0000 (13:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix #76778: array_reduce leaks memory if callback throws exception
Christoph M. Becker [Wed, 22 Aug 2018 11:32:55 +0000 (13:32 +0200)]
Fix #76778: array_reduce leaks memory if callback throws exception

We have to release the result variable in the error case, too.

6 years agoFixed bug #75797
Massimiliano Braglia [Tue, 21 Aug 2018 15:44:02 +0000 (17:44 +0200)]
Fixed bug #75797

Fix zend_register_class_alias_ex() to use non-persistent strings
for (non-persistent) userland classes.

6 years agoUse zend_class_entry/zend_function type names instead of _zend_class_entry/_zend_func...
Dmitry Stogov [Wed, 22 Aug 2018 11:01:14 +0000 (14:01 +0300)]
Use zend_class_entry/zend_function type names instead of _zend_class_entry/_zend_function tags.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Wed, 22 Aug 2018 10:55:17 +0000 (12:55 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fixed bug #76777 and added test

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 Aug 2018 10:53:57 +0000 (12:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #76777 and added test

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 22 Aug 2018 10:52:11 +0000 (12:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76777 and added test

6 years agoFixed bug #76777 and added test
Ville Hukkamaki [Wed, 22 Aug 2018 04:19:14 +0000 (06:19 +0200)]
Fixed bug #76777 and added test

Set undefined values to null rather than undefined.

6 years agoIntroduced ZEND_COMPILE_IGNORE_OTHER_FILES compiler option, to allow "separate" file...
Dmitry Stogov [Wed, 22 Aug 2018 10:45:56 +0000 (13:45 +0300)]
Introduced ZEND_COMPILE_IGNORE_OTHER_FILES compiler option, to allow "separate" file compilation (unaffected but previously compiled files), without CG(function_table)/CG(class_table) manipulation.

6 years agoUnify unpack checking in compile_special_func()
Nikita Popov [Wed, 22 Aug 2018 09:38:28 +0000 (11:38 +0200)]
Unify unpack checking in compile_special_func()

Instead of handling this separately for each specialized function,
do one check directly in zend_compile_special_func().

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Wed, 22 Aug 2018 09:22:23 +0000 (11:22 +0200)]
Merge branch 'PHP-7.3'

6 years agoDon't report mmap failure if it is expected
David Carlier [Tue, 21 Aug 2018 22:51:54 +0000 (23:51 +0100)]
Don't report mmap failure if it is expected

When using mmap with MAP_FIXED_NOREPLACE or MAP_FIXED|MAP_EXCL
an mmap failure is not an error condition, so do not print an
error message in this case.

6 years agoMerge branch 'PHP-7.3'
Dmitry Stogov [Wed, 22 Aug 2018 07:44:34 +0000 (10:44 +0300)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Stop using zend_function->reserved[] space.

6 years agoStop using zend_function->reserved[] space.
Dmitry Stogov [Wed, 22 Aug 2018 07:43:51 +0000 (10:43 +0300)]
Stop using zend_function->reserved[] space.

6 years agoRemoved op_array->static_variables duplication code. They can't be "shared" during...
Dmitry Stogov [Wed, 22 Aug 2018 05:24:28 +0000 (08:24 +0300)]
Removed op_array->static_variables duplication code. They can't be "shared" during comilation.

6 years agoDrop dead code
Nikita Popov [Tue, 21 Aug 2018 11:43:29 +0000 (13:43 +0200)]
Drop dead code

var_ast is always a ZEND_AST_ZVAL.

6 years agoCleanup
Dmitry Stogov [Tue, 21 Aug 2018 10:21:56 +0000 (13:21 +0300)]
Cleanup

6 years agoDon't use second operand of BIND_STATIC instruction.
Dmitry Stogov [Tue, 21 Aug 2018 09:22:04 +0000 (12:22 +0300)]
Don't use second operand of BIND_STATIC instruction.

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Tue, 21 Aug 2018 06:34:15 +0000 (08:34 +0200)]
Merge branch 'PHP-7.3'

6 years agoSupport fixed address mmap without replacement
David Carlier [Sun, 19 Aug 2018 19:32:28 +0000 (20:32 +0100)]
Support fixed address mmap without replacement

We did not use MAP_FIXED here, because it may replace an existing
mapping. This commit adds support for MAP_FIXED_NOREPLACE (available
on newer Linux kernels) and MAP_FIXED|MAP_EXCL (available on FreeBSD),
which avoid this issue.

6 years agoMerge branch 'PHP-7.3'
Dmitry Stogov [Tue, 21 Aug 2018 06:02:22 +0000 (09:02 +0300)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Removed dead code

6 years agoRemoved dead code
Dmitry Stogov [Tue, 21 Aug 2018 06:01:54 +0000 (09:01 +0300)]
Removed dead code

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Tue, 21 Aug 2018 04:27:27 +0000 (06:27 +0200)]
Merge branch 'PHP-7.3'

6 years agoAvoid directly adding to string literal
David Carlier [Mon, 13 Aug 2018 16:45:36 +0000 (17:45 +0100)]
Avoid directly adding to string literal

This fixes a Clang warning.

6 years agoMerge branch 'PHP-7.3'
Dmitry Stogov [Mon, 20 Aug 2018 13:11:40 +0000 (16:11 +0300)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers. Encode static variable offset into opline->extended_value.

6 years agoAvoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers.
Dmitry Stogov [Mon, 20 Aug 2018 13:10:09 +0000 (16:10 +0300)]
Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers.
Encode static variable offset into opline->extended_value.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Mon, 20 Aug 2018 10:56:54 +0000 (12:56 +0200)]
Merge branch 'PHP-7.3'

6 years ago[ci skip] Correct minor typo (GC_GLAGS to GC_FLAGS)
Aaron Stone [Sun, 19 Aug 2018 16:48:52 +0000 (09:48 -0700)]
[ci skip] Correct minor typo (GC_GLAGS to GC_FLAGS)

6 years agoMerge branch 'PHP-7.3'
Gabriel Caruso [Mon, 20 Aug 2018 00:33:41 +0000 (21:33 -0300)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Make array parsing parameters error messages consistency with ZPP failure

6 years agoMake array parsing parameters error messages consistency with ZPP failure
Gabriel Caruso [Sun, 5 Aug 2018 00:42:03 +0000 (21:42 -0300)]
Make array parsing parameters error messages consistency with ZPP failure

6 years agoMerge branch 'PHP-7.3'
Jakub Zelenka [Sun, 19 Aug 2018 19:20:46 +0000 (20:20 +0100)]
Merge branch 'PHP-7.3'

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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 19 Aug 2018 19:19:01 +0000 (20:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create())
Jakub Zelenka [Sun, 19 Aug 2018 19:14:26 +0000 (20:14 +0100)]
Fix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create())

6 years agoMap ERROR_PRIVILEGE_NOT_HELD to EACCES
Christoph M. Becker [Sun, 19 Aug 2018 11:52:48 +0000 (13:52 +0200)]
Map ERROR_PRIVILEGE_NOT_HELD to EACCES

Attempting to create a symlink on Windows via the CLI SAPI without
administrative rights is likely to fail with ERROR_PRIVILEGE_NOT_HELD.
Therefore we map this Windows error to EACCES to get better diagnostics
and to avoid the assert() failure in debug mode.

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Sat, 18 Aug 2018 18:06:14 +0000 (20:06 +0200)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Use stable deps on AppVeyor for now

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Sat, 18 Aug 2018 18:05:51 +0000 (20:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Use stable deps on AppVeyor for now

6 years agoUse stable deps on AppVeyor for now
Anatol Belski [Sat, 18 Aug 2018 18:04:19 +0000 (20:04 +0200)]
Use stable deps on AppVeyor for now

as long as the latest image is not synced with VC++ 15.8

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

* PHP-7.3:
  Add regression test for bug #68175
  Fix #68175: RegexIterator pregFlags are NULL instead of 0