Stanislav Malyshev 67fbb06311 Merge branch 'PHP-5.5' into PHP-7.0.5 ...

* PHP-5.5:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  Fix bug #71860: Require valid paths for phar filenames
  Going for 5.5.34

Conflicts:
	configure.in
	ext/phar/phar_object.c
	ext/phar/tests/badparameters.phpt
	ext/phar/tests/create_path_error.phpt
	ext/phar/tests/pharfileinfo_construct.phpt
	ext/snmp/snmp.c
	ext/standard/url.c
	main/php_version.h

2016-03-28 23:55:05 -07:00

..

phar

Fixed Bug #65467

2015-03-30 15:39:30 +02:00

tests

Fix bug #71860: Require valid paths for phar filenames

2016-03-20 21:33:11 -07:00

build_precommand.php

…

config.m4

fix arg order, CFLAGS is the fifth arg in m4

2014-10-17 16:03:40 +02:00

config.w32

converted ext/ereg, ext/phar and ext/pgsql for static tsrmls usage

2014-10-16 13:47:43 +02:00

CREDITS

…

dirstream.c

Merge branch 'PHP-5.6.18' into PHP-7.0.3

2016-02-01 20:00:01 -08:00

dirstream.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

func_interceptors.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

func_interceptors.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

gdbhelp

…

LICENSE

…

Makefile.frag

Merge branch 'PHP-5.6'

2015-05-21 14:07:14 +02:00

makestub.php

ZTS cleanup

2015-03-08 19:25:55 +08:00

package.xml

…

phar_internal.h

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

2016-03-03 16:50:01 +01:00

phar_object.c

Fix bug #71860: Require valid paths for phar filenames

2016-03-20 21:33:11 -07:00

phar_path_check.c

Happy new year (Update copyright to 2016)

2016-01-01 19:21:47 +02:00

phar_path_check.re

Happy new year (Update copyright to 2016)

2016-01-01 19:21:47 +02:00

phar.1.in

Happy new year (Update copyright to 2016)

2016-01-03 01:44:37 +02:00

phar.c

Merge branch 'PHP-5.5' into PHP-7.0.5

2016-03-28 23:55:05 -07:00

phar.phar.1.in

…

pharzip.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_phar.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

shortarc.php

…

stream.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

stream.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

stub.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

tar.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-02-29 22:44:46 +01:00

tar.h

Happy new year (Update copyright to 2016)

2016-01-01 19:21:47 +02:00

TODO

…

util.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

zip.c

Merge branch 'PHP-5.6.19' into PHP-7.0.4

2016-03-01 23:01:48 -08:00