diff options
Diffstat (limited to 'main/streams')
| -rw-r--r-- | main/streams/plain_wrapper.c | 2 | ||||
| -rw-r--r-- | main/streams/streams.c | 2 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 1aa01f270d..8590647818 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1399,7 +1399,7 @@ static php_stream_wrapper_ops php_plain_files_wrapper_ops = { php_plain_files_metadata }; -php_stream_wrapper php_plain_files_wrapper = { +PHPAPI php_stream_wrapper php_plain_files_wrapper = { &php_plain_files_wrapper_ops, NULL, 0 diff --git a/main/streams/streams.c b/main/streams/streams.c index 13af362681..c6420dc0d0 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1066,7 +1066,7 @@ PHPAPI zend_string *php_stream_get_record(php_stream *stream, size_t maxlen, con * searched for the delimiter. * The left part of the delimiter may still remain in the buffer, * so subtract up to <delim_len - 1> from buffered_len, which is - * the ammount of data we skip on this search as an optimization + * the amount of data we skip on this search as an optimization */ found_delim = _php_stream_search_delim( stream, maxlen, diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 746d9c93d9..7427a794b4 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -233,10 +233,11 @@ static int php_sockop_flush(php_stream *stream TSRMLS_DC) static int php_sockop_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC) { - php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; #if ZEND_WIN32 return 0; #else + php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; + return zend_fstat(sock->socket, &ssb->sb); #endif } |