From: Anatol Belski <ab@php.net>
Date: Sun, 8 Feb 2015 11:43:22 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~17^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=371db55871bc66f33f549d6db2b2d8547aca2599;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
	ext/soap/soap.c
	ext/wddx/wddx.c
	main/main.c
	sapi/litespeed/lsapi_main.c
---

371db55871bc66f33f549d6db2b2d8547aca2599