diff options
| author | Jani Taskinen <jani@php.net> | 2009-05-05 00:16:21 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-05-05 00:16:21 +0000 |
| commit | 6611eb0b984fca4a534ef94a4ff93a103af9f71d (patch) | |
| tree | c0f42a3e50af5deda15b662f01ff0392215af9c6 | |
| parent | 5a6d3cc42b9e9e19a744726ccfeaee332280e88d (diff) | |
| download | php-git-6611eb0b984fca4a534ef94a4ff93a103af9f71d.tar.gz | |
- Sync with HEAD
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index a3d55c84d0..77d18ab815 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -84,7 +84,7 @@ #define HTTP_WRAPPER_HEADER_INIT 1 #define HTTP_WRAPPER_REDIRECTED 2 -php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) +php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */ { php_stream *stream = NULL; php_url *resource = NULL; @@ -233,9 +233,8 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, } } - if (stream == NULL) { + if (stream == NULL) goto out; - } /* avoid buffering issues while reading header */ if (options & STREAM_WILL_CAST) @@ -327,6 +326,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, strlcat(scratch, " HTTP/1.0\r\n", scratch_len); } + /* send it */ php_stream_write(stream, scratch, strlen(scratch)); @@ -403,7 +403,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, strcat(scratch, ":"); strcat(scratch, resource->pass); - tmp = php_base64_encode((unsigned char*)scratch, strlen(scratch), NULL); + tmp = (char*)php_base64_encode((unsigned char*)scratch, strlen(scratch), NULL); if (snprintf(scratch, scratch_len, "Authorization: Basic %s\r\n", tmp) > 0) { php_stream_write(stream, scratch, strlen(scratch)); @@ -705,7 +705,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, unsigned char *s, *e; \ int l; \ l = php_url_decode(val, strlen(val)); \ - s = val; e = s + l; \ + s = (unsigned char*)val; e = s + l; \ while (s < e) { \ if (iscntrl(*s)) { \ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Invalid redirect URL! %s", new_path); \ @@ -769,22 +769,22 @@ out: return stream; } +/* }}} */ -php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC) +php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC) /* {{{ */ { return php_stream_url_wrap_http_ex(wrapper, path, mode, options, opened_path, context, PHP_URL_REDIRECT_MAX, HTTP_WRAPPER_HEADER_INIT STREAMS_CC TSRMLS_CC); } +/* }}} */ -static int php_stream_http_stream_stat(php_stream_wrapper *wrapper, - php_stream *stream, - php_stream_statbuf *ssb - TSRMLS_DC) +static int php_stream_http_stream_stat(php_stream_wrapper *wrapper, php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC) /* {{{ */ { /* one day, we could fill in the details based on Date: and Content-Length: * headers. For now, we return with a failure code to prevent the underlying * file's details from being used instead. */ return -1; } +/* }}} */ static php_stream_wrapper_ops http_stream_wops = { php_stream_url_wrap_http, |