delta/php-git.git/sapi/apache2handler, branch PHP-7.0.7

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

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

Also re bug #71575.

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-11T20:39:31+00:00

* PHP-5.6:
  Simplify code per Anatol.
  Insert bug number.
  Use strtoll() when apr_off_t is 64 bits.

Simplify code per Anatol.

2016-01-11T20:36:55+00:00

Insert bug number.

2016-01-11T20:36:53+00:00

Use strtoll() when apr_off_t is 64 bits.

2016-01-11T20:36:51+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)

Happy new year (Update copyright to 2016)

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

Fixed memleaks in apache2handler

2015-09-23T14:08:51+00:00

fix zend signal and tsrm compat

2015-09-01T08:34:54+00:00

Merge branch 'PHP-5.6'

2015-04-14T08:28:06+00:00

* PHP-5.6: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	Zend/zend_exceptions.c
	ext/curl/interface.c
	ext/dom/document.c
	ext/fileinfo/libmagic/softmagic.c
	ext/gd/gd.c
	ext/hash/hash.c
	ext/pgsql/pgsql.c
	ext/phar/phar.c
	ext/phar/phar_internal.h
	ext/standard/http_fopen_wrapper.c
	ext/standard/link.c
	ext/standard/streamsfuncs.c
	ext/xmlwriter/php_xmlwriter.c
	ext/zlib/zlib.c