delta/php-git.git/ext/zlib, branch php-7.0.8

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

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

Also re bug #71575.

Format string fixes

2016-02-14T13:45:53+00:00

Conflicts:
	ext/pgsql/pgsql.c

Merge branch 'PHP-5.6.18' into PHP-7.0.3

2016-02-02T04:00:01+00:00

* PHP-5.6.18:
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71488: Stack overflow when decompressing tar archives
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  Fix bug #71459 - Integer overflow in iptcembed()
  prepare 5.6.18RC1
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
  improve fix for bug #71201
  Fixed bug #71323 - Output of stream_get_meta_data can be falsified by its input
  Fix bug #71391: NULL Pointer Dereference in phar_tar_setupmetadata()
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
  Fix bug #71335: Type Confusion in WDDX Packet Deserialization
  Fix bug #71354 - remove UMR when size is 0

Conflicts:
	configure.in
	ext/phar/dirstream.c
	ext/phar/phar_object.c
	ext/phar/tar.c
	ext/standard/exec.c
	ext/standard/iptc.c
	ext/standard/math.c
	ext/standard/streamsfuncs.c
	ext/wddx/wddx.c
	main/php_version.h
	main/streams/memory.c

Merge branch 'PHP-5.5' into PHP-5.6.18

2016-02-02T03:15:19+00:00

* PHP-5.5:
  fix tests
  fix NEWS
  update NEWS

fix tests

2016-02-02T02:58:02+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01T17:48:25+00:00

* PHP-5.6:
  Happy new year (Update copyright to 2016)

2016-01-01T17:21:47+00:00

added test for gzgetss()

2015-08-23T15:55:23+00:00

Removed dead code

2015-08-17T15:18:25+00:00

switch to the unified globals accessor where appropriate

2015-07-29T11:26:35+00:00