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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix perms
---

181f34f3757563381ce8eaf963e73cd64b38ec21
diff --cc ext/openssl/openssl.c
index 00fd444c13,4a4ec6f67d..00fd444c13
mode 100755,100644..100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c