Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix NEWS indentation.
  Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
This commit is contained in:
Adam Harvey 2015-08-27 16:01:33 -07:00
commit de63ebf5f4
2 changed files with 4 additions and 2 deletions

2
NEWS
View File

@ -12,6 +12,8 @@ PHP NEWS
. Fixed bug #70187 (Notice: unserialize(): Unexpected end of serialized data)
(Dmitry)
. Fixed bug #70145 (From field incorrectly parsed from headers). (Anatol)
. Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
building extensions). (Adam)
. Fixed bug causing exception traces with anon classes to be truncated. (Bob)
- Curl:

4
build/libtool.m4 vendored
View File

@ -1545,7 +1545,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
freebsd[[123]]*) objformat=aout ;;
freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@ -3162,7 +3162,7 @@ case $host_os in
;;
esac
;;
freebsd[[12]]*)
freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;