Revert "Merge branch 'PHP-5.4' into PHP-5.5"

This reverts commit 5ac2e5f850c483394870dadca465c1322a4a51cf, reversing
changes made to 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec.

Conflicts:
	ext/openssl/xp_ssl.c