diff options
| author | Wez Furlong <wez@php.net> | 2002-03-17 01:58:42 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-03-17 01:58:42 +0000 |
| commit | 1d3ad85ac2fd78e6e14e835b5f00d4b1d092b33b (patch) | |
| tree | cd4f5cfcc4444c7315cdc835868f249fe439236b | |
| parent | 8261132f41f4f9702582b05b4d075bb73ce8f126 (diff) | |
| download | php-git-1d3ad85ac2fd78e6e14e835b5f00d4b1d092b33b.tar.gz | |
fix win32 warning and ming leak
| -rw-r--r-- | ext/ming/ming.c | 2 | ||||
| -rw-r--r-- | ext/standard/fsock.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/ming/ming.c b/ext/ming/ming.c index 41e341de4a..7233e3e4d2 100644 --- a/ext/ming/ming.c +++ b/ext/ming/ming.c @@ -1610,6 +1610,8 @@ PHP_FUNCTION(swfmovie_save) retval = SWFMovie_output(getMovie(getThis() TSRMLS_CC), &phpStreamOutputMethod, (void *)stream); + php_stream_close(stream); + RETURN_LONG(retval); } diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index 2d1b4be05a..ce9da8d34b 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -161,7 +161,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) 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 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) } 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", |