From: Anatol Belski <ab@php.net>
Date: Wed, 1 Feb 2017 11:57:02 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.3RC1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a7fe51235f3f599a87f7f4e4eaad71bf8f8808c;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
---

5a7fe51235f3f599a87f7f4e4eaad71bf8f8808c