Obtain latest sourcecode. To update sourcecode in kcomkar/php-src repository #1

Open
wants to merge 10,000 commits into
from
@kcomkar
Owner

Obtain latest sourcecode. To update sourcecode in kcomkar/php-src repository

@staabm

should shm_nattach etc not be increased in this case?

Yeah, you're right. Whereby the segment is likely to be unusable in the given process anyway.

Thanks.

weltling and others added some commits Aug 18, 2016
@weltling weltling map ell the err code 20aae1c
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  map ell the err code
61bc661
@weltling weltling fix test 91cd55e
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test
ecdd24f
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix test
4016c19
@jpauli jpauli Updated UPGRADING about function call args 5818b09
@jpauli jpauli Merge branch 'PHP-7.1'
* PHP-7.1:
  Updated UPGRADING about function call args
3bb3ca3
@weltling weltling avoid other efforts if memory mapping fails 98d8794
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  avoid other efforts if memory mapping fails
2f430a4
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  avoid other efforts if memory mapping fails
de570f5
@weltling weltling fix format 74cfb22
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix format
6b12c6a
@weltling weltling update NEWS e6d3221
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
b4b8d08
@weltling weltling update NEWS 2a1d35e
@cmb69 cmb69 Fix broken test include
To avoid that the test stalls, we must always use `t` mode.
bc1214f
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  update NEWS
  update NEWS
e0866b1
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 caf0ad4
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 cf40f99
@cmb69 cmb69 Merge branch 'PHP-7.1' 235e700
@nikic nikic Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
37b0dcc
@nikic nikic Merge branch 'PHP-7.1' 6416312
@dshafik dshafik Sync NEWS 0b1c817
@laruence laruence Fixed bug #72888 (Segfault on clone on splFileObject) 566d65d
@laruence laruence Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #72888 (Segfault on clone on splFileObject)
  Sync NEWS
1c187f6
@dshafik dshafik Update NEWS for 7.1.0RC1 0880bd1
@cmb69 cmb69 Fix dba configuration for Windows
To be able to build the dba extension on Windows, libdb was required. This
is contrary to *nix where each handler can be configured individually. To
avoid BC breaks, we only do minimal modifications, instead of adjusting the
Windows configuration to match the *nix configuration, for now.
ad76e8a
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 4df8546
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 9fcee1e
@cmb69 cmb69 Merge branch 'PHP-7.1' c849506
@weltling weltling Improve fix for bug #72837 2d123a9
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Improve fix for bug #72837
83255b1
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  Improve fix for bug #72837
f9b3faa
@cmb69 cmb69 Revert "Fix dba configuration for Windows"
This reverts commit ad76e8a.

After a discussion with Anatol it seems to be better QA wise to not make
this change in stable versions or betas.
057278b
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 61344c6
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 ae92977
@cmb69 cmb69 Merge branch 'PHP-7.1' 62896a8
@cmb69 cmb69 Fix dba configuration for Windows
To be able to build the dba extension on Windows, libdb was required. This
is contrary to *nix where each handler can be configured individually. We
only do minimal modifications, instead of adjusting the Windows configuration
to match the *nix configuration, for now.
2c6f88a
@weltling weltling Fixed bug #72852 imap_mail null dereference 21f08a7
@weltling weltling update NEWS f682193
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  Fixed bug #72852 imap_mail null dereference
a569b88
@weltling weltling update NEWS a556543
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  update NEWS
  Fixed bug #72852 imap_mail null dereference
f613582
@weltling weltling update NEWS 98a155f
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS
  Fixed bug #72852 imap_mail null dereference
14987f2
@cmb69 cmb69 Fix #72714: _xml_startElementHandler() segmentation fault
The issue is caused by an integer overflow when the `long` passed as
XML_OPTION_SKIP_TAGSTART is assigned to `xml_parser::toffset` which is
declared as `int`. We can simply work around this issue, by clipping
resulting negative values to 0 (and raising a notice in this case), because
the reasonable range for this value is certainly catered to by positive
`int`s.

However, there still remains the issue that `xml_parser::toffset` is later
added to `char *`s, which can cause OOB reads, so we make sure that the
upper bound never exceeds the strlen(). We eschew optimizing `SKIP_TAGSTART`
wrt. to the potentially duplicate strlen() call, because that code path is
unexpected anyway.
9164dc1
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 db1ef5c
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 76c796f
@cmb69 cmb69 Merge branch 'PHP-7.1' 754a3de
@cmb69 cmb69 Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
According to the Unicode specification (at least as of 5.1), CRLF sequences
are considered to be a single grapheme. We cater to that special case by
letting grapheme_ascii_check() fail. While it would be trivial to fix
grapheme_ascii_check() wrt. grapheme_strlen(), grapheme_substr() and
grapheme_strrpos() would be much harder to handle, so we accept the slight
performance penalty if CRLF is involved.
e4a006c
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 078f674
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 29849e5
@cmb69 cmb69 Merge branch 'PHP-7.1' 9cb560f
@cmb69 cmb69 Improvements to fix #72714, suggested by nikic 52793c1
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 39172d4
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 9988863
@cmb69 cmb69 Merge branch 'PHP-7.1' 70e6b9c
@nikic nikic Fix off-by-one in ReflectionType::__toString()
Review mistake...
dfed09a
@nikic nikic Merge branch 'PHP-7.1' 3294356
@weltling weltling fix TS issues with url rewrite globals 872028d
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix TS issues with url rewrite globals
0eac646
@trowski trowski Revert "Append \ to class name returned from ReflectionType::__toStri…
…ng()"

This reverts commit 20fdd47.
c9ee0cb
@trowski trowski Revert "Fix closure tests using ReflectionType::__toString()"
This reverts commit 6fcedc9.
08c5d77
@trowski trowski Do not prepend ? on nullables in ReflectionType::__toString()
Better BC with 7.0.
8855a2c
@trowski trowski Merge branch 'PHP-7.1'
# Conflicts:
#	NEWS
#	UPGRADING
83bdcf0
@laruence laruence Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from…
…_buffer (zend_gc.c:260))
b740bb3
@laruence laruence Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:/php-src:
  Improvements to fix #72714, suggested by nikic
  Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
  Fix #72714: _xml_startElementHandler() segmentation fault
  update NEWS
  Fixed bug #72852 imap_mail null dereference
  Revert "Fix dba configuration for Windows"
  Fix dba configuration for Windows
  Fix broken test include
  fix NEWS
  Add myself as PDO_OCI maintainer
226e21b
@laruence laruence Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
17e8a3d
@laruence laruence Fixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper) 0476bb1
@laruence laruence Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
e572035
@laruence laruence This is unecessary for 7.1 (IS_ERROR is an internal type) e849e65
@laruence laruence Merge branch 'PHP-7.1'
* PHP-7.1:
  This is unecessary for 7.1 (IS_ERROR is an internal type)
  Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))
9121c87
@cmb69 cmb69 Fix #66005: imagecopy does not support 1bit transparency on truecolor…
… images

We must not copy transparent pixels, see
<libgd/libgd@daac285>.
9eb5bbd
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 7a36056
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 15f1b04
@cmb69 cmb69 Merge branch 'PHP-7.1' 222cf29
@cmb69 cmb69 Fix #72913: imagecopy() loses single-color transparency on palette im…
…ages

The proper code to handle true-color to palette copies is already contained
in gdImageCopy(), so we can simply remove the buggy duplicated code.
d65adac
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 4c68fc5
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 3dc6c4b
@cmb69 cmb69 Merge branch 'PHP-7.1' f2d26f9
@weltling weltling extend readdir utf-8 name test 096b0a5
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  extend readdir utf-8 name test
e8ae2ba
@cmb69 cmb69 Fix #68716: possible resource leaks in _php_image_convert()
We properly clean up after ourselves wrt. to closing opened file pointers
and created images.
6a232c3
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 4c13a7f
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 5347246
weltling and others added some commits Aug 25, 2016
@weltling weltling update NEWS 57509fb
@weltling weltling update NEWS 9f6d2c0
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  pdo_dblib: stringify uniqidentifier field
726e3b8
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  update NEWS
  update NEWS
  pdo_dblib: stringify uniqidentifier field
9950485
@laruence laruence Fixed bug #72943 (assign_dim on string doesn't reset hval) c67fa3c
@laruence laruence Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72943 (assign_dim on string doesn't reset hval)

Conflicts:
	Zend/zend_execute.c
557f1cc
@laruence laruence Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #72943 (assign_dim on string doesn't reset hval)
5ac4973
@cmb69 cmb69 Fix #72949: Typo in opcache error message c4c3eb5
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 14cd14d
@cmb69 cmb69 Merge branch 'PHP-7.1' 22a88d5
@weltling weltling fix leak 88f6706
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
e6b9446
@cmb69 cmb69 Fix #65550: get_browser() incorrectly parsers entries with "+" sign
+ signs in the browscap patterns are meant to be literal characters, so we
have to escape them for the regex matching.
2139918
@cmb69 cmb69 Merge branch 'PHP-5.6' into PHP-7.0 8fcfacf
@cmb69 cmb69 Merge branch 'PHP-7.0' into PHP-7.1 3a78530
@cmb69 cmb69 Merge branch 'PHP-7.1' 5345988
@weltling weltling fix leak d582028
@weltling weltling fix clang compat 8a8a441
@weltling weltling add parentheses b6440a7
@weltling weltling fix leak 92a60a6
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
  add parentheses
  fix clang compat
  fix leak
f407707
@laruence laruence Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key s…
…hould end with '\0')
986d0f8
@laruence laruence Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
0170191
@laruence laruence Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
727571c
@weltling weltling integrate clang analyzer 10c2ac8
@weltling weltling fix leak 378ed99
@weltling weltling extend clang vs compat options 48b1cb2
@weltling weltling fix leak b415290
@weltling weltling extend help msg be0958d
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help msg
  fix leak
  extend clang vs compat options
  fix leak
  integrate clang analyzer
d2ac2cd
Yasuo Ohgaki Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc 1cf179e
Yasuo Ohgaki Merge branch 'PHP-7.1'
* PHP-7.1:
  Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc
07d1f0c
George Wang Added .user.ini support.
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
c73bcbe
George Wang Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	sapi/litespeed/lsapi_main.c
ca1eb58
George Wang Merge branch 'PHP-7.0' into PHP-7.1 413bd26
George Wang code cleanup. 0a09eec
George Wang Merge branch 'PHP-7.1' 698b88f
@dstogov dstogov Fixed bug #72944 (Null pointer deref in zval_delref_p). b66039d
@dstogov dstogov Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72944 (Null pointer deref in zval_delref_p).
b5bab0f
@dstogov dstogov Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #72944 (Null pointer deref in zval_delref_p).
6318c80
@weltling weltling fix dealloc mismatch eac7f4b
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix dealloc mismatch
0e709fe
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix dealloc mismatch
3e938cd
@weltling weltling fix possible memory leak 1d7ec68
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix possible memory leak
a747578
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix possible memory leak
1ac5564
@weltling weltling fix leak d80a317
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak
50c5d13
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
1e30122
@bukka bukka Add initial failure checking for json_encode 12a8c3f
@bukka bukka Fix recursion and protection in the failed JSON encoding df05dbb
@bukka bukka Add test for fixed bug #68992 27acbcf
@bukka bukka Update NEWS with info about a json_encode fail return f5b4aae
@bukka bukka Merge branch 'json_encode_fail_return' into PHP-7.1 ab65665
@bukka bukka Merge branch 'PHP-7.1' a2a0c0d
@bukka bukka Bump PHP_JSON_VERSION to 1.5.0 c4961fa
@bukka bukka Merge branch 'PHP-7.1' 9580f5d
@weltling weltling fix leak 7ecfb4b
@weltling weltling add error check and fix leak 201f90a
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  add error check and fix leak
  fix leak
646d3f6
@weltling weltling support also cppcheck for static analyze 3ab2a58
@weltling weltling fix search path faccbeb
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix search path
  support also cppcheck for static analyze
90c3829
@weltling weltling fix leak e2609a3
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix leak
ca4eeed
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak
78c15e2
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
8bb2dd8
@weltling weltling extend help message 78401a7
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help message
5101bd0
@weltling weltling add note to UPGRADING.INTERNALS 3196ea1
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  add note to UPGRADING.INTERNALS
f04687d
@weltling weltling fix double free 1d93086
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix double free
5c8aa47
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix double free
d3321e0
@weltling weltling fix double free 1a840b9
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix double free
3437dbf
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix double free
a349afd
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix double free
7632610
@dstogov dstogov Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes. 94fbcbe
@dstogov dstogov Merge branch 'PHP-7.1'
* PHP-7.1:
  Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes.
8d53393
@dstogov dstogov Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
  fix double free
722783c
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix double free
73d497a
@weltling weltling Fixed bug #72703 Out of bounds global memory read in BF_crypt trigger…
…ed by password_verify
295303b
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
946335b
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
22a825d
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
dc8be19
@weltling weltling ensure null termination d787b0e
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  ensure null termination
2004585
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  ensure null termination
c560678
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  ensure null termination
2a71140
@weltling weltling update NEWS ae81e8f
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
b6b7696
@weltling weltling update NEWS 5bcae9d
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  update NEWS
2b96705
@weltling weltling update NEWS 6bb5b6e
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS
9a79765
@weltling weltling fix HANDLE leak c7b4cd1
@weltling weltling Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix HANDLE leak
1b227de
@weltling weltling Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix HANDLE leak
2bfe926
@weltling weltling Merge branch 'PHP-7.1'
* PHP-7.1:
  fix HANDLE leak
41b502c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment