fix dir separator in test

2015-04-15T10:43:00+00:00

5.5.24

2015-04-15T08:50:17+00:00

fix non-standard C

2015-04-15T08:20:58+00:00

Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)

2015-04-15T08:19:40+00:00

fix test

2015-04-15T08:19:32+00:00

fix type in fix for #69085

2015-04-15T08:19:04+00:00

(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)

fix memory leak & add test

2015-04-15T08:18:35+00:00

Fix tests

2015-04-15T08:18:25+00:00

Merge branch 'PHP-5.5-security' into PHP-5.5.24

2015-04-15T08:17:26+00:00

* PHP-5.5-security: (22 commits)
  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)
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes
  Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
  sigh, can't even copypaste without screwing up
  oop, put both the error number and message for both db object to the error message
  test fixes
  Fixed bug #69281 (opcache_is_script_cached no longer works)
  Fix typo: unitialized -> uninitialized
  Fix typo: unitialized -> uninitialized
  Fixed bug #68739 (Missing break / control flow). Fixed bug #68740 (NULL Pointer Dereference). Fixed bug #68677 (Use After Free).
  Fixed bug #68739 (Missing break / control flow in curl)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fixed bug #68677 (Use After Free in OPcache)
  ...

Conflicts:
	configure.in
	ext/curl/tests/bug69316.phpt
	main/php_version.h

Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)

2015-04-15T08:16:36+00:00

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