Commit Graph

87669 Commits

Author SHA1 Message Date
Xinchen Hui
cb42fe6777 UPDATE NEWS 2015-01-31 19:12:30 +08:00
Xinchen Hui
dc2670bd25 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-31 18:13:43 +08:00
Xinchen Hui
1a60175e25 Fixed Magic getter bug tickled by Moodle 2015-01-31 18:12:31 +08:00
Michael Wallner
f5808f32ac Partially revert. I did not notice there's alaready a .PHONY target for
generated_lists. Force removing configure before running autoconf is
enough to make this work as expected.
2015-01-31 10:57:53 +01:00
Xinchen Hui
8aab1c619c Fixed unused opline warning 2015-01-31 16:50:17 +08:00
Michael Wallner
130d7320b1 Merge branch 'incorrect_close' of github.com:MegaManSec/php-src
* 'incorrect_close' of github.com:MegaManSec/php-src:
  Use correct deallocator in phpdbg
2015-01-30 23:11:33 +01: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
c0477fbcb5 Squashed commit of the following:
commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
2015-01-30 23:01:26 +01:00
Michael Wallner
3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Michael Wallner
570ed1a1a4 fix warnings 2015-01-30 22:32:00 +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
34710ddc59 really only signal reports 2015-01-30 19:52:09 +01:00
Michael Wallner
97b5dabeb1 fix warnings 2015-01-30 19:03:59 +01:00
Michael Wallner
d88edb6d96 also catch segfaults reported by subshells 2015-01-30 18:00:23 +01:00
Michael Wallner
fa453d5abd make buildconf actually work 2015-01-30 17:58:49 +01:00
Anatol Belski
563e7822fd fix datatype mismatches, improve error checks 2015-01-30 16:31:19 +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
d61556e80c Update NEWs 2015-01-30 13:14:44 +08:00
Xinchen Hui
73288bbea4 Fixed bug #68937 (Segfault in curl_multi_exec) 2015-01-30 13:12:58 +08:00
Xinchen Hui
56ab00b0fe Merge branch 'new_null_de' of https://github.com/MegaManSec/php-src 2015-01-30 11:09:19 +08:00
Xinchen Hui
88e13bda6a Fixed bug #68945 (Unknown admin values segfault pools) 2015-01-30 11:01:42 +08:00
Joshua Rogers
26d5ad6c98 Add check for null pointer, as done in case 5 lines above. 2015-01-30 13:30:17 +11: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