From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 28 Feb 2014 14:30:21 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d022c8565da4ec079cd285b245fd28e3f31a3cdb;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
---

d022c8565da4ec079cd285b245fd28e3f31a3cdb