Another big commit (tm).

Main Changes:
- Implement a socket transport layer for use by all code that needs to open
  some kind of "special" socket for network or IPC.
- Extensions can register (and override) transports.
- Implement ftruncate() on streams via the ioctl-alike option interface.
- Implement mmap() on streams via the ioctl-alike option interface.
- Implement generic crypto API via the ioctl-alike option interface.
  (currently only supports OpenSSL, but could support other SSL toolkits,
  and other crypto transport protocols).

Impact:
- tcp sockets can be overloaded by the openssl capable sockets at runtime,
  removing the link-time requirement for ssl:// and https:// sockets and
  streams.
- checking stream types using PHP_STREAM_IS_SOCKET is deprecated, since
  there are now a range of possible socket-type streams.

Working towards:
- socket servers using the new transport layer
- mmap support under win32
- Cleaner code.

# I will be updating the win32 build to add the new files shortly
# after this commit.

1 files changed, 0 insertions, 22 deletions

diff --git a/main/streams/cast.c b/main/streams/cast.c
index aa6e6d12b2..1ebc6af877 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -296,28 +296,6 @@ PHPAPI FILE * _php_stream_open_wrapper_as_file(char *path, char *mode, int optio
 
 	if (stream == NULL)
 		return NULL;
-
-#ifdef PHP_WIN32
-	/* Avoid possible strange problems when working with socket based streams */
-	if ((options & STREAM_OPEN_FOR_INCLUDE) && php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
-		char buf[CHUNK_SIZE];
-
-		fp = php_open_temporary_file(NULL, "php", NULL TSRMLS_CC);
-		if (fp) {
-			while (!php_stream_eof(stream)) {
-				size_t didread = php_stream_read(stream, buf, sizeof(buf));
-				if (didread > 0) {
-					fwrite(buf, 1, didread, fp);
-				} else {
-					break;
-				}
-			}
-			php_stream_close(stream);
-			rewind(fp);
-			return fp;
-		}
-	}
-#endif
 	
 	if (php_stream_cast(stream, PHP_STREAM_AS_STDIO|PHP_STREAM_CAST_TRY_HARD|PHP_STREAM_CAST_RELEASE,
 				(void**)&fp, REPORT_ERRORS) == FAILURE)