#include "SAPI.h"
-#if (PHP_MAJOR_VERSION >= 5)
+#ifdef ZEND_ENGINE_2
#include "ext/standard/php_http.h"
#else
-#include "php_http_build_query.h"
#include "http_build_query.c"
#endif
/* {{{ STATUS http_send_ranges(zval *, void *, size_t, http_send_mode) */
PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
{
- zval **zrange;
+ int c;
long **begin, **end;
- char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024];
- int i, c;
+ zval **zrange;
/* Send HTTP 206 Partial Content */
http_send_status(206);
/* single range */
if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
+ char range_header[256] = {0};
+
zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin);
zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end);
}
/* multi range */
-
- snprintf(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
- strncat(multi_header, bound + 2, 21);
- http_send_header(multi_header);
-
- /* send each requested chunk */
- for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
- i < c;
- i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
- if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
- Z_ARRVAL_P(zranges), (void **) &zrange) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
- SUCCESS != zend_hash_index_find(
- Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
- break;
+ else {
+ int i;
+ char bound[23] = {0}, preface[1024] = {0},
+ multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
+
+ snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
+ strncat(multi_header, bound + 2, 21);
+ http_send_header(multi_header);
+
+ /* send each requested chunk */
+ for ( i = 0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
+ i < c;
+ i++, zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
+ if ( HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
+ Z_ARRVAL_P(zranges), (void **) &zrange) ||
+ SUCCESS != zend_hash_index_find(
+ Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
+ SUCCESS != zend_hash_index_find(
+ Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+ break;
+ }
+
+ snprintf(preface, 1023,
+ HTTP_CRLF "%s"
+ HTTP_CRLF "Content-Type: %s"
+ HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+ HTTP_CRLF
+ HTTP_CRLF,
+
+ bound,
+ HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
+ **begin,
+ **end,
+ size
+ );
+
+ php_body_write(preface, strlen(preface) TSRMLS_CC);
+ http_send_chunk(data, **begin, **end + 1, mode);
}
- snprintf(preface, 1024,
- "\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound,
- HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
- **begin, **end, size);
- php_body_write(preface, strlen(preface) TSRMLS_CC);
- http_send_chunk(data, **begin, **end + 1, mode);
- }
-
- /* write boundary once more */
- php_body_write("\r\n", 1 TSRMLS_CC);
- php_body_write(bound, strlen(bound) TSRMLS_CC);
+ /* write boundary once more */
+ php_body_write(HTTP_CRLF, 2 TSRMLS_CC);
+ php_body_write(bound, strlen(bound) TSRMLS_CC);
- return SUCCESS;
+ return SUCCESS;
+ }
}
/* }}} */
char *d_ptr;
*decoded_len = 0;
- *decoded = (char *) ecalloc(1, encoded_len);
+ *decoded = (char *) ecalloc(encoded_len, 1);
d_ptr = *decoded;
e_ptr = encoded;
hex_len[i++] = *e_ptr++;
}
+ /* reached the end */
+ if (!strcmp(hex_len, "0")) {
+ break;
+ }
+
+ /* new line */
+ if (strncmp(e_ptr, HTTP_CRLF, 2)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Invalid character (expected 0x0D 0x0A; got: %x %x)",
+ *e_ptr, *(e_ptr + 1));
+ efree(*decoded);
+ return FAILURE;
+ }
+
/* hex to long */
- if (strcmp(hex_len, "0")) {
+ {
char *error = NULL;
chunk_len = strtol(hex_len, &error, 16);
if (error == hex_len) {
efree(*decoded);
return FAILURE;
}
- } else {
- break;
}
- /* new line */
- if (*e_ptr++ != '\r' || *e_ptr++ != '\n') {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
- "Invalid character (expected 0x0A, 0x0D; got: %x)",
- *(e_ptr - 1));
- efree(*decoded);
- return FAILURE;
- }
-
- memcpy(d_ptr, e_ptr, chunk_len);
+ memcpy(d_ptr, e_ptr += 2, chunk_len);
d_ptr += chunk_len;
e_ptr += chunk_len + 2;
*decoded_len += chunk_len;
}
/* }}} */
-/* {{{ proto void http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
+/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
zval *zbody TSRMLS_DC)
{
char *header, *response, *body = NULL;
Z_TYPE_P(zbody) = IS_NULL;
}
- /* check for HTTP status - FIXXME: strchr() */
+ return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_headers(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *array TSRMLS_DC)
+{
+ char *colon = NULL, *line = NULL, *begin = header;
+
+ if (header_len < 8) {
+ return FAILURE;
+ }
+
+ /* status code */
if (!strncmp(header, "HTTP/1.", 7)) {
- char *end = strchr(header, '\r');
- add_assoc_stringl(zheaders, "Status",
+ char *end = strstr(header, HTTP_CRLF);
+ add_assoc_stringl(array, "Status",
header + strlen("HTTP/1.x "),
end - (header + strlen("HTTP/1.x ")), 1);
header = end + 2;
}
- /* split headers */
- {
- char *colon = NULL, *line = header;
- while ( (line - Z_STRVAL_P(zresponse) + 3) <
- (body - Z_STRVAL_P(zresponse))) {
- switch (*line++)
- {
- case '\r':
- if (colon && (*line == '\n')) {
- char *key = estrndup(header, colon - header);
- add_assoc_stringl(zheaders, key,
- colon + 2, line - colon - 3, 1);
- efree(key);
-
- colon = NULL;
- header += line - header + 1;
- }
- break;
+ line = header;
- case ':':
- if (!colon) {
- colon = line - 1;
- }
- break;
- }
+ while (header_len > (line - begin)) {
+ switch (*line++)
+ {
+ case 0:
+ case '\n':
+ if (colon && (*line != ' ') && (*line != '\t')) {
+ char *key = estrndup(header, colon - header);
+ add_assoc_stringl(array, key, colon + 2, line - colon - 4, 1);
+ efree(key);
+
+ colon = NULL;
+ header += line - header;
+ }
+ break;
+
+ case ':':
+ if (!colon) {
+ colon = line - 1;
+ }
+ break;
}
}
+ return SUCCESS;
}
/* }}} */
projects / m6w6 / ext-http / blobdiff