X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=dc73233a7691599d0766d6a34815014838fb0e90;hp=b89102d473be15fe5ecf0aff69f83e6395d7c765;hb=2e1cd7f9942bb07d7c3a2efb79090215fc1406d6;hpb=e6d4ae260275041fcc32f06f3487cdef6613c646 diff --git a/http_send_api.c b/http_send_api.c index b89102d..dc73233 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -148,6 +148,24 @@ static STATUS _http_send_chunk(const void *data, size_t begin, size_t end, http_ } /* }}} */ +/* {{{ STATUS http_send_header(char *, char *, zend_bool) */ +PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC) +{ + STATUS ret; + size_t header_len = sizeof(": ") + name_len + value_len + 1; + char *header = emalloc(header_len + 1); + + header[header_len] = '\0'; + snprintf(header, header_len, "%s: %s", name, value); + ret = http_send_header_string_ex(header, replace); + if (sent_header) { + *sent_header = header; + } else { + efree(header); + } + return ret; +} +/* }}} */ /* {{{ STATUS http_send_status_header(int, char *) */ PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, zend_bool replace TSRMLS_DC) @@ -155,38 +173,40 @@ PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, STATUS ret; sapi_header_line h = {(char *) header, header ? strlen(header) : 0, status}; if (SUCCESS != (ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, &h TSRMLS_CC))) { - http_error_ex(E_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status); + http_error_ex(HE_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status); } return ret; } /* }}} */ /* {{{ STATUS http_send_last_modified(int) */ -PHP_HTTP_API STATUS _http_send_last_modified(time_t t TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSRMLS_DC) { - char *date = NULL; - if (date = http_date(t)) { - char modified[96] = "Last-Modified: "; - strcat(modified, date); - efree(date); - - /* remember */ - HTTP_G(send).last_modified = t; + STATUS ret; + char *date = http_date(t); - return http_send_header(modified); + if (!date) { + return FAILURE; } - return FAILURE; + + ret = http_send_header_ex("Last-Modified", lenof("Last-Modified"), date, strlen(date), 1, sent_header); + efree(date); + + /* remember */ + HTTP_G(send).last_modified = t; + + return ret; } /* }}} */ /* {{{ STATUS http_send_etag(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char **sent_header TSRMLS_DC) { STATUS status; char *etag_header; if (!etag_len){ - http_error_ex(E_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(send).unquoted_etag); + http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(send).unquoted_etag); return FAILURE; } @@ -196,21 +216,14 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag, size_t etag_len TSRMLS_DC) etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len); sprintf(etag_header, "ETag: \"%s\"", etag); - status = http_send_header(etag_header); - efree(etag_header); - return status; -} -/* }}} */ - -/* {{{ STATUS http_send_cache_control(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t cc_len TSRMLS_DC) -{ - STATUS status; - char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len); - - sprintf(cc_header, "Cache-Control: %s", cache_control); - status = http_send_header(cc_header); - efree(cc_header); + status = http_send_header_string(etag_header); + + if (sent_header) { + *sent_header = etag_header; + } else { + efree(etag_header); + } + return status; } /* }}} */ @@ -218,11 +231,8 @@ PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, size_t c /* {{{ STATUS http_send_content_type(char *, size_t) */ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC) { - STATUS status; - char *ct_header; - if (!strchr(content_type, '/')) { - http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", content_type); + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", content_type); return FAILURE; } @@ -230,11 +240,7 @@ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_ STR_FREE(HTTP_G(send).content_type); HTTP_G(send).content_type = estrndup(content_type, ct_len); - ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len); - sprintf(ct_header, "Content-Type: %s", content_type); - status = http_send_header(ct_header); - efree(ct_header); - return status; + return http_send_header_ex("Content-Type", lenof("Content-Type"), content_type, ct_len, 1, NULL); } /* }}} */ @@ -252,7 +258,7 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename); } - status = http_send_header(cd_header); + status = http_send_header_string(cd_header); efree(cd_header); return status; } @@ -261,33 +267,33 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t /* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC) { - long **begin, **end; - zval **zrange; + zval **zbegin, **zend, **zrange; /* single range */ if (zend_hash_num_elements(ranges) == 1) { char range_header[256] = {0}; if (SUCCESS != zend_hash_index_find(ranges, 0, (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)) { + SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &zbegin) || + SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &zend)) { http_send_status(500); return FAILURE; } - + /* Send HTTP 206 Partial Content */ http_send_status(206); /* send content range header */ - snprintf(range_header, 255, "Content-Range: bytes %ld-%ld/%lu", **begin, **end, (ulong) size); - http_send_header(range_header); + snprintf(range_header, 255, "Content-Range: bytes %ld-%ld/%lu", Z_LVAL_PP(zbegin), Z_LVAL_PP(zend), (ulong) size); + http_send_header_string(range_header); /* send requested chunk */ - return http_send_chunk(data, **begin, **end + 1, mode); + return http_send_chunk(data, Z_LVAL_PP(zbegin), Z_LVAL_PP(zend) + 1, mode); } /* multi range */ else { + size_t preface_len; char bound[23] = {0}, preface[1024] = {0}, multi_header[68] = "Content-Type: multipart/byteranges; boundary="; @@ -297,16 +303,16 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ /* send multipart/byteranges header */ snprintf(bound, 22, "--%lu%0.9f", (ulong) time(NULL), php_combined_lcg(TSRMLS_C)); strncat(multi_header, bound + 2, 21); - http_send_header(multi_header); + http_send_header_string(multi_header); /* send each requested chunk */ FOREACH_HASH_VAL(ranges, zrange) { - if (SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) || - SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) { + if (SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &zbegin) || + SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &zend)) { break; } - snprintf(preface, 1023, + preface_len = snprintf(preface, 1023, HTTP_CRLF "%s" HTTP_CRLF "Content-Type: %s" HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu" @@ -315,13 +321,13 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ bound, HTTP_G(send).content_type ? HTTP_G(send).content_type : "application/x-octetstream", - **begin, - **end, + Z_LVAL_PP(zbegin), + Z_LVAL_PP(zend), (ulong) size ); - PHPWRITE(preface, strlen(preface)); - http_send_chunk(data, **begin, **end + 1, mode); + PHPWRITE(preface, preface_len); + http_send_chunk(data, Z_LVAL_PP(zbegin), Z_LVAL_PP(zend) + 1, mode); } /* write boundary once more */ @@ -335,7 +341,7 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ /* }}} */ /* {{{ STATUS http_send(void *, size_t, http_send_mode) */ -PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send_mode data_mode TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_send_mode data_mode, zend_bool no_cache TSRMLS_DC) { HashTable ranges; http_range_status range_status; @@ -355,7 +361,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send } /* enable partial dl and resume */ - http_send_header("Accept-Ranges: bytes"); + http_send_header_string("Accept-Ranges: bytes"); zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); range_status = http_get_request_ranges(&ranges, data_size); @@ -369,7 +375,8 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send /* Range Request - only send ranges if entity hasn't changed */ if ( range_status == RANGE_OK && http_match_etag_ex("HTTP_IF_MATCH", HTTP_G(send).unquoted_etag, 0) && - http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(send).last_modified, 0)) { + http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(send).last_modified, 0) && + http_match_last_modified_ex("HTTP_UNLESS_MODIFIED_SINCE", HTTP_G(send).last_modified, 0)) { STATUS result = http_send_ranges(&ranges, data_ptr, data_size, data_mode); zend_hash_destroy(&ranges); return result; @@ -378,32 +385,45 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, size_t data_size, http_send zend_hash_destroy(&ranges); /* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */ - if (cache_etag) { + if (!no_cache && cache_etag) { char *etag = NULL; if (!(etag = http_etag(data_ptr, data_size, data_mode))) { - http_error(E_NOTICE, HTTP_E_PARAM, "Failed to generate ETag for data source"); + http_error(HE_NOTICE, HTTP_E_RUNTIME, "Failed to generate ETag for data source"); } else { - http_send_etag(etag, 32); + char *sent_header = NULL; + + http_send_etag_ex(etag, 32, &sent_header); if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { - return http_cache_exit_ex(etag, 1, 1); + return http_exit_ex(304, sent_header, NULL, 0); + } else { + STR_FREE(sent_header); } efree(etag); } } /* send 304 Not Modified if last modified matches */ - if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G(send).last_modified)) { - return http_cache_exit_ex(http_date(HTTP_G(send).last_modified), 0, 1); + if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G(send).last_modified)) { + char *sent_header = NULL; + http_send_last_modified_ex(HTTP_G(send).last_modified, &sent_header); + return http_exit_ex(304, sent_header, NULL, 0); } + /* emit a content-length header */ + if (!php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) { + char *cl; + spprintf(&cl, 0, "Content-Length: %lu", (unsigned long) data_size); + http_send_header_string(cl); + efree(cl); + } /* send full entity */ return http_send_chunk(data_ptr, 0, data_size, data_mode); } /* }}} */ /* {{{ STATUS http_send_stream(php_stream *) */ -PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream TSRMLS_DC) +PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream, zend_bool no_cache TSRMLS_DC) { STATUS status; php_stream_statbuf ssb; @@ -412,7 +432,7 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea return FAILURE; } - status = http_send(file, ssb.sb.st_size, SEND_RSRC); + status = http_send_ex(file, ssb.sb.st_size, SEND_RSRC, no_cache); if (close_stream) { php_stream_close(file);