delta/php-git.git/sapi/apache2handler, branch php-5.6.12

Merge branch 'PHP-5.4.40' into PHP-5.5.24

2015-04-11T23:56:12+00:00

* PHP-5.4.40:
  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)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.

Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)

2015-04-11T23:53:21+00:00

Shut up, my lovely compiler; I do not like your warnings

2015-02-09T03:23:35+00:00

Conflicts:
	Zend/zend_object_handlers.c

Bump year

2015-01-15T15:26:03+00:00

Merge branch 'PHP-5.4' into PHP-5.5

2014-04-13T22:37:55+00:00

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

2014-04-13T22:36:43+00:00

Bump year

2014-01-03T03:06:16+00:00

Bump year

2014-01-03T03:04:26+00:00

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06T18:06:09+00:00

Whitespace changes and a couple of grammar fixes.

non living code related typo fixes

2013-08-04T23:05:36+00:00