]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Tue, 16 Dec 2014 09:21:05 +0000 (10:21 +0100)
committerAnatol Belski <ab@php.net>
Tue, 16 Dec 2014 09:21:05 +0000 (10:21 +0100)
commita85eb75cba76845c645732e3ba230b83b019a914
tree9219b1d47a722c270e476fa89b9f4558239a87b0
parent9e4310eeebf40e8fe3ab2f85203ea8cb1545b685
parent53c8b180c8efaab3edf7a02d39ca4e9628e1f67b
Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  fix perm again...
  cleanup uneeded cast
  fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)

Conflicts:
ext/phar/func_interceptors.c
ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c
ext/phar/func_interceptors.c
ext/phar/phar_object.c
sapi/apache2handler/sapi_apache2.c