php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,698 Commits 549 Branches 1,485 Tags
2a46fc0470c0cec055178af8cb962c8d52fb4700
Commit Graph

75698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Harvey 2a46fc0470 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:19:13 -07:00
Adam Harvey 69f12ad582 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:16:36 -07:00
Adam Harvey aa7d3d8e6d Track created curl_slist structs by option so they can be updated in situ. 
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.

This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.

Fixes bug #65458 (curl memory leak).
 2013-08-19 12:01:04 -07:00
Stanislav Malyshev d17ade127b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
 2013-08-19 11:19:43 -07:00
Stanislav Malyshev d2c78c9e20 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
 2013-08-19 11:19:11 -07:00
Stanislav Malyshev d0beb7daf9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  added new glob() test
 2013-08-19 11:18:57 -07:00
Xinchen Hui a4862503d4 Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). 2013-08-19 11:18:51 -07:00
Stanislav Malyshev 4ea9729cd0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
 2013-08-19 10:53:08 -07:00
Xinchen Hui 7a79cf0206 Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). 2013-08-19 10:42:47 -07:00
Anatol Belski f4df40108b fixed glob() edge case on windows, ref bug #47358 2013-08-19 14:21:16 +02:00
Anatol Belski f61b648da4 modified the new glob() test for master 2013-08-19 11:22:18 +02:00
Anatol Belski 6c570ad322 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added new glob() test
 2013-08-19 11:21:47 +02:00
Anatol Belski cdc64f0345 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added new glob() test
 2013-08-19 11:19:42 +02:00
Anatol Belski 4bad49e3bc added new glob() test 2013-08-19 11:17:13 +02:00
Stanislav Malyshev cfe5833579 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix using wrong buffer pointer
 2013-08-19 01:07:50 -07:00
Stanislav Malyshev 8e0f110099 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix using wrong buffer pointer
 2013-08-19 01:04:19 -07:00
Stanislav Malyshev cf96aa155e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix using wrong buffer pointer
 2013-08-19 01:03:18 -07:00
Stanislav Malyshev c1c49d6e39 fix using wrong buffer pointer 2013-08-19 01:02:12 -07:00
Stanislav Malyshev ecd67ed3e5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
 2013-08-18 17:24:16 -07:00
Stanislav Malyshev bcf785fb66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
 2013-08-18 17:23:59 -07:00
Stanislav Malyshev 14f5732096 Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace 2013-08-18 17:22:25 -07:00
Stanislav Malyshev 12c2a8a5eb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix for php bug #64802 includes test case
 2013-08-18 16:55:03 -07:00
Stanislav Malyshev bd29ff7c38 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
 2013-08-18 15:45:17 -07:00
Mark Jones 9973658a44 Fix for php bug #64802 includes test case 2013-08-18 15:42:37 -07:00
Stanislav Malyshev 42214b6474 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
 2013-08-18 15:19:27 -07:00
Marcel Araujo 265224778b Use in preg_replace_callback() using variables by reference and test for bug #64979 2013-08-18 15:18:30 -07:00
Marcel Araujo 47678c06c6 https://bugs.php.net/bug.php?id=64979 2013-08-18 15:09:43 -07:00
Stanislav Malyshev 33e9c02451 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add CVE-2011-4718
 2013-08-18 14:42:59 -07:00
Stanislav Malyshev b33a1a1397 add CVE-2011-4718 2013-08-18 14:42:06 -07:00
Stanislav Malyshev 4bc6e06037 Merge branch 'PHP-5.5' 
* PHP-5.5:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:24 -07:00
Stanislav Malyshev bf0c6f2858 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:21:14 -07:00
Stanislav Malyshev 4fbce676bd Merge branch 'pull-request/381' 
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
 2013-08-18 14:20:46 -07:00
Stanislav Malyshev 0154db1c5f new for fix #65225 2013-08-18 14:20:17 -07:00
Patrick Allaert 98d29d20a1 Fixed #65225: PHP_BINARY incorrectly set 2013-08-18 14:18:33 -07:00
Stanislav Malyshev 756ce65b92 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:34 -07:00
Stanislav Malyshev 1794291ebe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use pkg-config to detect iodbc
 2013-08-18 14:16:24 -07:00
Ole Markus With a3fa25e857 Use pkg-config to detect iodbc 2013-08-18 14:16:17 -07:00
Stanislav Malyshev 8845262995 Merge branch 'pull-request/411' 
* pull-request/411:
  Use pkg-config to detect iodbc
 2013-08-18 14:15:53 -07:00
Stanislav Malyshev 958ee39fc7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:11:15 -07:00
Stanislav Malyshev 2ee7e122a7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
 2013-08-18 14:09:19 -07:00
Stanislav Malyshev f4da131328 Merge branch 'pull-request/412' 
* pull-request/412:
  Create test to the extension xmlrpc
 2013-08-18 14:08:57 -07:00
Stanislav Malyshev 3da2fb335d Add -P option to use the current binary 2013-08-18 14:08:03 -07:00
root ac2d2b9b72 Create test to the extension xmlrpc 2013-08-18 13:59:39 -07:00
Stanislav Malyshev 5786e779fb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:52:49 -07:00
Stanislav Malyshev 296a434d52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:52:38 -07:00
Tianfeng 4a0e87e497 Fixbug: phpize --clean will delete include/*.h 2013-08-18 13:52:20 -07:00
Stanislav Malyshev 625152591b Merge branch 'pull-request/405' 
* pull-request/405:
  Fixbug: phpize --clean will delete include/*.h
 2013-08-18 13:50:33 -07:00
Stanislav Malyshev 03b2603ce0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  code related typo fixes
  Fix duplicated 5.5.2 NEWS in my tree
 2013-08-18 13:47:00 -07:00
Veres Lajos 144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
root acda3dab6c Create test to the extension xmlrpc 2013-08-18 18:44:52 +00:00