Anatol Belski a85eb75cba 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

2014-12-16 10:21:05 +01:00

20 KiB

Raw Blame History

View Raw