From: Remi Collet <remi@php.net>
Date: Tue, 16 Dec 2014 07:38:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~5^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee0b922ecee9796087bbbf281e9f0f873a02b714;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix perms
---

ee0b922ecee9796087bbbf281e9f0f873a02b714
diff --cc ext/openssl/openssl.c
index 60d36ff743,00fd444c13..60d36ff743
mode 100755,100644..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c