1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

87525 Commits

Author SHA1 Message Date
Adam Harvey eb6dc9db29 Make gc_collect_cycles hookable. 2015-01-23 19:23:58 +00:00
Dmitry Stogov e427188755 Fixed memory leak 2015-01-23 21:47:26 +03:00
Dmitry Stogov be31acc927 Fixed memory leak 2015-01-23 20:35:32 +03:00
Anatol Belski ee8a0b3797 cleanup TSRMLS_* 2015-01-23 18:05:18 +01:00
Dmitry Stogov b06ba87926 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  C89 compat
2015-01-23 17:11:19 +03:00
Dmitry Stogov a7f1bf3ec5 Fixed possible double free of class static members 2015-01-23 17:10:05 +03:00
Anatol Belski 647caea9f7 C89 compat 2015-01-23 15:04:29 +01:00
Dmitry Stogov 46e486ff3d It doesn't make sense to colect garbage after fatal errors 2015-01-23 16:40:16 +03:00
Dmitry Stogov f71e64e53a Revert "Fixed ASSERTION"
This reverts commit 76f438e06f.
2015-01-23 16:37:39 +03:00
Xinchen Hui 4369215b8f Merge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src 2015-01-23 17:35:37 +08:00
Reeze Xia bdfe4d6558 Fix one more leak when wrong $needle type provide of strripos 2015-01-23 17:14:39 +08:00
Reeze Xia d44b6e58ba Fixed memory leak of strripos() when empty needle or haystack 2015-01-23 16:53:58 +08:00
Xinchen Hui ad36fe34df Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-23 14:19:40 +08:00
Xinchen Hui 76f438e06f Fixed ASSERTION 2015-01-23 14:18:56 +08:00
Daniel Lowrey ec62b8ddb6 NEWS 2015-01-23 01:05:28 -05:00
Daniel Lowrey 459edceea9 Merge branch 'master' of https://github.com/bbroerman30/php-src
Conflicts:
	ext/openssl/xp_ssl.c
2015-01-23 01:03:39 -05:00
Xinchen Hui 16732dedfe Fixed refcount handling in get_class_vars() 2015-01-23 13:32:07 +08:00
Sara Golemon b8e262901e Add missing ZEND_API tag to declaration of int zendparse(); 2015-01-22 14:04:49 -08:00
Ferenc Kovacs 5f61f0b976 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix some factual errors in the process
2015-01-22 21:29:03 +01:00
Ferenc Kovacs 49cc1d4e84 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix some factual errors in the process
2015-01-22 21:28:41 +01:00
Ferenc Kovacs f014785eeb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix some factual errors in the process
2015-01-22 21:28:21 +01:00
Ferenc Kovacs 61ad5e24ea fix some factual errors in the process 2015-01-22 21:27:38 +01:00
Dmitry Stogov b494aa0ba0 Fixed compiler reenterability 2015-01-22 20:39:34 +03:00
Dmitry Stogov 6f0e5aab43 Fixed GC after destruction of object store. 2015-01-22 20:38:42 +03:00
Kalle Sommer Nielsen 26eb876bb7 Remove Jouni (As requested) from the maintainers file of INTERBASE 2015-01-22 15:15:02 +01:00
Anatol Belski 699ada706a Fixed bug #68884 Null pointer deference 2015-01-22 15:01:27 +01:00
Dmitry Stogov faf917d94e define() must not modify the source array 2015-01-22 15:49:38 +03:00
Remi Collet 0b70f58822 Merge branch 'PHP-5.6'
* PHP-5.6:
  move CVE to the right version
2015-01-22 13:07:34 +01:00
Remi Collet b318e54fac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move CVE to the right version
2015-01-22 13:06:50 +01:00
Remi Collet 2955993947 move CVE to the right version 2015-01-22 13:06:15 +01:00
Anatol Belski 53d01c4580 Merge branch 'master' of git.php.net:php-src 2015-01-22 12:29:03 +01:00
Anatol Belski d2a4940bd2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
2015-01-22 12:28:11 +01:00
Anatol Belski 093a23d1c4 Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
The fix for bug #67647 applies here, too.
2015-01-22 12:26:50 +01:00
Dmitry Stogov e21fefde38 Fixed destruction of circular garbage 2015-01-22 14:24:27 +03:00
Anatol Belski ccffa2aad1 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

Conflicts:
	ext/fileinfo/data_file.c
2015-01-22 11:56:34 +01:00
Anatol Belski c9d0894ec5 Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
Dmitry Stogov 061c0ed9ee Fixed double free and cleanup 2015-01-22 12:59:53 +03:00
Anatol Belski ca0bb7dd81 Merge branch 'master' of git.php.net:php-src 2015-01-22 10:19:08 +01:00
Anatol Belski f9d672f7d4 Merge branch 'PHP-5.6'
* PHP-5.6:
  simplify error handling for dirs as magic
2015-01-22 10:17:45 +01:00
Anatol Belski 60c2621b2a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  simplify error handling for dirs as magic
2015-01-22 10:17:14 +01:00
Michael Wallner 86aab0aedb avoid duplicate array_init
custom request body handling firing the rfc1867 handler after the
environment has been hashed might create a memory leak by calling
array_init() twice on PG(http_globals)[TRACK_VARS_FILES]
2015-01-22 10:16:38 +01:00
Anatol Belski 43652d386a simplify error handling for dirs as magic 2015-01-22 10:16:13 +01:00
Anatol Belski a2e83332b9 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2015-01-22 10:04:33 +01:00
Anatol Belski b2c39c1d29 Merge branch 'master' of git.php.net:php-src 2015-01-22 10:03:24 +01:00
Anatol Belski 4e3e95dfc0 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #68827 Double free with disabled ZMM
2015-01-22 10:02:05 +01:00
Anatol Belski a97ca0a452 updated NEWS 2015-01-22 10:01:16 +01:00
Anatol Belski d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
2015-01-22 10:00:10 +01:00
Joshua Rogers 91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Xinchen Hui fc25720986 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-22 16:55:53 +08:00
Xinchen Hui 6ae57df70b Revert "Fixed valgrind reported issue with setlocale"
This reverts commit fa06343d7e.
2015-01-22 16:55:20 +08:00