php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
87,673 Commits 549 Branches 1,485 Tags
457367e0b612af2da8b92536699dd6e9bb11b310
Commit Graph

37481 Commits

Author SHA1 Message Date
Stanislav Malyshev 457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Yasuo Ohgaki d8803d8147 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed typo in comment
 2015-02-01 05:15:27 +09:00
Yasuo Ohgaki d9a9afa499 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed typo in comment
 2015-02-01 05:14:56 +09:00
Yasuo Ohgaki c8a12508c7 Fixed typo in comment 2015-02-01 05:14:27 +09:00
Michael Wallner 0d267bdecc Merge branch 'close_cor' of github.com:MegaManSec/php-src 
* 'close_cor' of github.com:MegaManSec/php-src:
  Fix interbase va_start
 2015-01-30 23:05:10 +01:00
Michael Wallner 3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Michael Wallner 7a94243402 fix warnings 2015-01-30 22:19:23 +01:00
Michael Wallner 960d103d63 fix warnings 2015-01-30 21:36:23 +01:00
Michael Wallner 330d158e93 fix warning 2015-01-30 20:11:25 +01:00
Michael Wallner bd06f8bb5f fix warnings 2015-01-30 20:08:17 +01:00
Michael Wallner b72b4084a5 fix warnings 2015-01-30 20:04:04 +01:00
Michael Wallner f6508f9fa2 fix warnings 2015-01-30 19:54:46 +01:00
Michael Wallner 97b5dabeb1 fix warnings 2015-01-30 19:03:59 +01:00
Xinchen Hui 35c5855201 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-30 22:11:50 +08:00
Xinchen Hui 4f5d010269 Fixed segfault introduced in f869bf3829 2015-01-30 22:11:21 +08:00
Anatol Belski 8d054be62f fix datatype mismatches, improve error checks 2015-01-30 14:36:33 +01:00
Anatol Belski 085907d168 fix datatype mismatches, improved error checks 2015-01-30 13:52:11 +01:00
Anatol Belski 3acdbaeba0 fix datatype mismatch warns, improve error check 2015-01-30 12:14:27 +01:00
Anatol Belski 397615071c make the cleanup function as static, as it's not exported 2015-01-30 11:20:25 +01:00
Anatol Belski f6330f9912 fix datatype mismatches, add stronger error checks 2015-01-30 11:10:11 +01:00
Anatol Belski 55936775d2 fix datatype mismatches, improve error checks 2015-01-30 11:02:25 +01:00
Anatol Belski d2f64edf29 remove unused var 2015-01-30 10:31:37 +01:00
Anatol Belski bc5686f5d2 remove unused variable 2015-01-30 10:30:45 +01:00
Anatol Belski aa5e34d79e remove unused var 2015-01-30 10:28:57 +01:00
Xinchen Hui e78dd7ade2 Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"" 
This reverts commit 348be58f86.
 2015-01-30 17:01:59 +08:00
Xinchen Hui d28af7394a Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-30 16:50:55 +08:00
Xinchen Hui 348be58f86 Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0" 2015-01-30 16:50:13 +08:00
Anatol Belski 6895cf6e69 nmake install missing header 2015-01-30 09:24:18 +01:00
Xinchen Hui 007d5f2921 indent 2015-01-30 13:19:27 +08:00
Xinchen Hui 91ce41dc1e Add more test for bug #68937 2015-01-30 13:17:35 +08:00
Xinchen Hui 73288bbea4 Fixed bug #68937 (Segfault in curl_multi_exec) 2015-01-30 13:12:58 +08:00
Xinchen Hui 2505aea153 Fixed valgrind issue in mb_ereg_replace_variation1.phpt 2015-01-29 19:28:46 +08:00
Yasuo Ohgaki 7f52978c67 Remove excessive macros 2015-01-29 19:48:50 +09:00
Yasuo Ohgaki 07a5dfca5b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use bash rather than sh
 2015-01-29 15:27:24 +09:00
Yasuo Ohgaki 7b06cc8d22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use bash rather than sh
 2015-01-29 15:27:08 +09:00
Yasuo Ohgaki d463ddd3c7 Use bash rather than sh 2015-01-29 15:21:17 +09:00
Xinchen Hui d96eb4b0a8 reorder the branches 2015-01-29 12:50:56 +08:00
Xinchen Hui 18c647cce2 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-29 12:35:44 +08:00
Xinchen Hui 14396a3264 ppid must be IS_STRING 2015-01-29 12:35:18 +08:00
Yasuo Ohgaki 70b2d2eefa Use proper type 2015-01-29 13:31:40 +09:00
Xinchen Hui 4da7e4de29 The argument must be not changed in session_start 2015-01-29 12:26:13 +08:00
Xinchen Hui a1d9ceac7a Fixed annoying warnings 2015-01-29 11:59:37 +08:00
Yasuo Ohgaki 7a97eaf25d Cleanup session id files after test 2015-01-29 10:31:39 +09:00
Yasuo Ohgaki f90f6108c8 Merge branch 'master' into master-rfc-session-lock4 
Conflicts:
	UPGRADING
 2015-01-29 09:55:36 +09:00
Yasuo Ohgaki 14d68d3641 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #68941 mod_files.sh is a bash-script
 2015-01-29 09:31:21 +09:00
Yasuo Ohgaki 5f28622e09 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script
 2015-01-29 09:29:11 +09:00
Yasuo Ohgaki abf9e2ea09 Fixed Bug #68941 mod_files.sh is a bash-script 2015-01-29 09:25:28 +09:00
Nikita Popov d133e68bab Remove support for hex number from is_numeric_string 2015-01-28 22:54:17 +01:00
Stanislav Malyshev 14d6de97c5 add imap 2015-01-28 10:15:11 -08:00
Xinchen Hui b7751630d1 Merge branch 'PHP-5.6' 
Conflicts:
	ext/phar/phar_object.c
 2015-01-29 00:02:03 +08:00