Derick Rethans
3e8975bc95
Merge branch 'PHP-5.6'
2014-11-11 14:01:31 -03:00
Derick Rethans
a19d96fc58
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 14:01:26 -03:00
Derick Rethans
695a102ede
- Updated to version 2014.10 (2014j)
2014-11-11 14:01:24 -03:00
Xinchen Hui
8511b33bd0
Update NEWs
2014-11-11 16:33:36 +08:00
Xinchen Hui
75b6f97334
Merge branch 'PHP-5.6'
...
Conflicts:
ext/soap/soap.c
2014-11-11 16:31:32 +08:00
Xinchen Hui
399ec40a76
Update NEWS
2014-11-11 16:24:59 +08:00
Xinchen Hui
e003c56c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-11 16:23:18 +08:00
Xinchen Hui
327d4f9afb
Fixed bug #68361 (Segmentation fault on SoapClient::__getTypes)
2014-11-11 16:22:49 +08:00
Anatol Belski
6d215f8cee
fix trailing slash
2014-11-11 00:51:21 +01:00
Anatol Belski
d509e79d70
further fixes to win build
...
- fixed pdb generation with vs
- made object-out-dir to use an absolute path, that fixes path issues
with x86/x64 and nmake snap
2014-11-11 00:38:37 +01:00
Anatol Belski
64c081f347
moved libs and debug/release mode setup into functions
2014-11-10 23:30:16 +01:00
Anatol Belski
96805364fa
fix var declaration used by macro conditions
2014-11-10 23:30:15 +01:00
Anatol Belski
5ad7cad103
fix sprintf spec
2014-11-10 23:30:15 +01:00
Anatol Belski
940e69147e
fix var usage only when unistd.h available
2014-11-10 23:30:14 +01:00
Anatol Belski
c3471cc1c9
cleanup unused variable
2014-11-10 23:30:13 +01:00
Anatol Belski
88ba5a625c
do portable socket checks
...
also introduced a portable macro for that
2014-11-10 23:30:12 +01:00
Anatol Belski
09aa419d13
initialiize opline for the case it lands in default case
2014-11-10 23:30:11 +01:00
Rasmus Lerdorf
96c5c1ef59
Fix skipif test here
2014-11-10 10:42:57 -08:00
Rasmus Lerdorf
ad468d20b1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #68370 ("unset($this)" can make the program crash)
Fixed NEWS for 5.5
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
2014-11-10 10:42:30 -08:00
Rasmus Lerdorf
bff7dc70d8
Fix skipif test here
2014-11-10 10:42:17 -08:00
Rasmus Lerdorf
1e5077d1e8
Fix skipif test here
2014-11-10 10:41:18 -08:00
Rasmus Lerdorf
5464e331d1
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src: (70 commits)
convert_to_string also does the check
A better fix(do the convertion in compile time)
update UPGRADING.INTERNALS
better description for the toolset config option
use proper declarations for zend_stat_t
move these functions to the appropriate place
Fixed segfault in bug62500.phpt
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
move more common ldflags into function
rename intel toolset to icc - shorter
fix gd compilation with icc toolset
either ms or intel linker is used, /libpath is supported
further catch up with phpize and improved clang arch setup
add /fallback for clang-cl
parametrize WINVER and update its value
further refactoring of toolset+phpize stuff
catch up the toolset changes with phpize
fix linking for clang, using linker directly
adjust pid_t declaration so it doesn't conflict with apache one
...
2014-11-10 10:36:57 -08:00
Rasmus Lerdorf
19992250cf
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Update NEWS
Fixed bug #68370 ("unset($this)" can make the program crash)
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
2014-11-10 10:36:46 -08:00
Xinchen Hui
44bc735a62
convert_to_string also does the check
2014-11-10 23:41:55 +08:00
Xinchen Hui
28ee04f480
Merge branch 'master' of https://git.php.net/repository/php-src
2014-11-10 23:38:33 +08:00
Xinchen Hui
84cd04fca0
A better fix(do the convertion in compile time)
2014-11-10 23:35:45 +08:00
Anatol Belski
5eb65a71a7
update UPGRADING.INTERNALS
2014-11-10 14:25:14 +01:00
Anatol Belski
744fb45217
better description for the toolset config option
2014-11-10 10:58:21 +01:00
Anatol Belski
25e75cd091
use proper declarations for zend_stat_t
2014-11-10 10:58:20 +01:00
Anatol Belski
999d387bf8
move these functions to the appropriate place
...
and include the necessary header
2014-11-10 10:58:19 +01:00
Xinchen Hui
249e3de5da
Fixed segfault in bug62500.phpt
2014-11-10 17:54:18 +08:00
Xinchen Hui
7d69fa7179
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
2014-11-10 13:52:07 +08:00
Xinchen Hui
3ae9399e40
Merge branch 'PHP-5.6'
...
Conflicts:
Zend/zend_execute_API.c
2014-11-10 13:51:24 +08:00
Xinchen Hui
eacf998af2
Update NEWS
2014-11-10 13:47:50 +08:00
Xinchen Hui
b9e44888c0
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-10 13:47:14 +08:00
Xinchen Hui
ab84939254
Fixed bug #68370 ("unset($this)" can make the program crash)
2014-11-10 13:46:47 +08:00
Anatol Belski
12cf41ca35
move more common ldflags into function
2014-11-07 19:58:30 +01:00
Anatol Belski
af7e3064f3
rename intel toolset to icc - shorter
2014-11-07 19:24:17 +01:00
Anatol Belski
7d7182e1b0
fix gd compilation with icc toolset
2014-11-07 19:13:41 +01:00
Anatol Belski
2e5cba25e8
either ms or intel linker is used, /libpath is supported
2014-11-07 18:39:03 +01:00
Anatol Belski
fc734cf95d
further catch up with phpize and improved clang arch setup
2014-11-07 18:33:37 +01:00
Anatol Belski
cfd2b39c18
add /fallback for clang-cl
2014-11-07 14:36:13 +01:00
Anatol Belski
c78c6adbd5
parametrize WINVER and update its value
2014-11-07 14:07:33 +01:00
Anatol Belski
b155ba21bd
further refactoring of toolset+phpize stuff
2014-11-07 13:48:29 +01:00
Julien Pauli
722dd4637b
Fixed NEWS for 5.5
2014-11-07 12:59:48 +01:00
Anatol Belski
4d8c28af60
catch up the toolset changes with phpize
...
also packed common parts into functions so there's less code duplication
2014-11-07 11:48:03 +01:00
Anatol Belski
46d6baf6a0
fix linking for clang, using linker directly
2014-11-07 10:18:11 +01:00
Anatol Belski
936575c2e2
adjust pid_t declaration so it doesn't conflict with apache one
2014-11-07 10:18:09 +01:00
Anatol Belski
1310bb5e2e
using the determined linker instead of compiler
...
this is a clang issue, longer parameter strings would be issue for both
compiler and linker
2014-11-07 10:18:03 +01:00
Anatol Belski
ac71c5812b
fix x64 recognition for clang and icc
2014-11-07 10:18:02 +01:00
