delta/php-git.git/ext/zip/php_zip.c, branch php-5.5.24 git.php.net: repository/php-src.git Merge branch 'PHP-5.5-security' into PHP-5.5.24 2015-04-15T08:17:26+00:00 Stanislav Malyshev stas@php.net 2015-04-13T03:12:38+00:00 363e6ce60b744673c5c3cd5e11486674bcb96a6b * 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 
* 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
Bump year 2015-01-15T15:26:03+00:00 Xinchen Hui laruence@php.net 2015-01-15T15:09:28+00:00 73c1be26531f730d64d61962b56eaf28ce3fc6aa 






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

Xinchen Hui
laruence@php.net

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

47c902777297ce895aa915c13efdb00881af3669












Merge branch 'PHP-5.4' into PHP-5.5
2013-12-19T09:53:50+00:00

Remi Collet
remi@php.net

2013-12-19T09:53:50+00:00

32d1d5fb596dec74b555ff2077930e95cda1a3b0

* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)





* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)







Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19T09:53:38+00:00

Remi Collet
remi@php.net

2013-12-19T09:53:38+00:00

20eb8e4d11d46c399f2920af0a552007d8d5d608












Merge branch 'PHP-5.4' into PHP-5.5
2013-10-20T11:50:13+00:00

Felipe Pena
felipensp@gmail.com

2013-10-20T11:50:13+00:00

8aa19c9fd8bcccd76d5246064fd4eab4e4b5c4f2

* PHP-5.4:
  - Moved NULL check before dereferencing





* PHP-5.4:
  - Moved NULL check before dereferencing







- Moved NULL check before dereferencing
2013-10-20T11:50:11+00:00

Felipe Pena
felipensp@gmail.com

2013-10-20T11:50:11+00:00

9976b5cd7f36d90b49d1dcf58ec6497f0e592b7d












Merge branch 'PHP-5.4' into PHP-5.5
2013-10-20T03:05:00+00:00

Felipe Pena
felipensp@gmail.com

2013-10-20T03:05:00+00:00

8d22c231617cafba3a34a490036cccb31a393d70

* PHP-5.4:
  - Fix possible memory leak





* PHP-5.4:
  - Fix possible memory leak







- Fix possible memory leak
2013-10-20T03:04:55+00:00

Felipe Pena
felipensp@gmail.com

2013-10-20T03:04:55+00:00

420068c6e1806a2b12be481abba1afec5d73d82e












Merge branch 'PHP-5.4' into PHP-5.5
2013-08-15T03:43:25+00:00

Christopher Jones
sixd@php.net

2013-08-15T03:43:25+00:00

39612afc72623e89a2bc595c9be4be497568d1be

* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c





* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c