delta/php-git.git, branch php-7.0.5

Merge branch 'PHP-5.6' into PHP-7.0

2016-03-29T13:50:21+00:00

* PHP-5.6:
  fix dir separator in test

fix item order

2016-03-29T10:03:01+00:00

fix credit

2016-03-29T10:00:38+00:00

set versions

2016-03-29T09:56:50+00:00

update NEWS

2016-03-29T09:54:36+00:00

Merge branch 'PHP-5.5' into PHP-7.0.5

2016-03-29T06:55:05+00:00

* 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

Merge remote-tracking branch 'security/PHP-7.0.5' into PHP-7.0.5

2016-03-29T06:49:03+00:00

* security/PHP-7.0.5:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fix bug #71860: Require valid paths for phar filenames
  update NEWS
  Fixed bug #71704 php_snmp_error() Format String Vulnerability

Fixed bug #71704 php_snmp_error() Format String Vulnerability

2016-03-29T06:42:19+00:00

Conflicts:
	ext/snmp/snmp.c

Merge branch 'PHP-5.5.34' into PHP-5.5

2016-03-29T06:29:45+00:00

* PHP-5.5.34:
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut

Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut

2016-03-29T06:15:16+00:00