From: Remi Collet <remi@php.net>
Date: Thu, 20 Nov 2014 06:52:19 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~43^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edb05ae37e806b5b3a880a7c92e8c1d4b91c18e5;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Factorization and consistency - create a fpm_use_error_log() to check when file or stderr should be used - use it everywhere for consistency - add some comments
---

edb05ae37e806b5b3a880a7c92e8c1d4b91c18e5