cvs: php4 /ext/ming ming.c /ext/standard fsock.c

wez Sat Mar 16 20:58:41 2002 EDT Modified files: /php4/ext/standard fsock.c /php4/ext/ming ming.c Log: fix win32 warning and ming leak Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.89 php4/ext/standard/fsock.c:1.90 --- php4/ext/standard/fsock.c:1.89 Sat Mar 16 17:08:23 2002 +++ php4/ext/standard/fsock.c Sat Mar 16 20:58:41 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.89 2002/03/16 22:08:23 phanto Exp $ */ +/* $Id: fsock.c,v 1.90 2002/03/17 01:58:41 wez Exp $ */ /* converted to PHP Streams and moved much code to main/network.c [wez] */ @@ -161,7 +161,7 @@ if (port > 0) { /* connect to a host */ enum php_sslflags_t { php_ssl_none, php_ssl_v23, php_ssl_tls }; - enum php_sslflags_t ssl_flags; + enum php_sslflags_t ssl_flags = php_ssl_none; struct { char *proto; int protolen; @@ -193,7 +193,7 @@ } else #endif - stream = php_stream_sock_open_host(host, port, socktype, (int)timeout, persistent); + stream = php_stream_sock_open_host(host, (unsigned short)port, socktype, (int)timeout, persistent); if (stream == NULL) { zend_error(E_WARNING, "%s(): unable to connect to %s:%d", Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.30 php4/ext/ming/ming.c:1.31 --- php4/ext/ming/ming.c:1.30 Sat Mar 16 17:19:32 2002 +++ php4/ext/ming/ming.c Sat Mar 16 20:58:41 2002 @@ -1610,6 +1610,8 @@ retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream); + php_stream_close(stream); + RETURN_LONG(retval); }