Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix TS build

diff --cc ext/openssl/xp_ssl.c
index 45b3d61d0d086a369d948ac3b4eb266003bbe678,b9a30df6cfd2aff48253ab4bb7aefe99106adf0a..16516e5c095689f074ad818fb0f81107f12c1135
--- 1/ext/openssl/xp_ssl.c
--- 2/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@@ -1796,9 -203,8 +1796,9 @@@ static size_t php_openssl_sockop_write(
        
        return didwrite;
  }
 +/* }}} */
  
- static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC)
+ static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock)
  {
        int retval;
        struct timeval *ptimeout;