X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=dc73233a7691599d0766d6a34815014838fb0e90;hp=6dfc677f993b5be0eef58657c291506311b986c8;hb=2e1cd7f9942bb07d7c3a2efb79090215fc1406d6;hpb=a60610ff0f84cdf46d8b39c9e64eefd701c1b565 diff --git a/http_send_api.c b/http_send_api.c index 6dfc677..dc73233 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -158,7 +158,11 @@ PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, cons header[header_len] = '\0'; snprintf(header, header_len, "%s: %s", name, value); ret = http_send_header_string_ex(header, replace); - efree(header); + if (sent_header) { + *sent_header = header; + } else { + efree(header); + } return ret; } /* }}} */ @@ -185,7 +189,7 @@ PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSR return FAILURE; } - ret = http_send_header_ex("Last-Modified", lenof("Last-Modifed"), date, strlen(date), 1, sent_header); + ret = http_send_header_ex("Last-Modified", lenof("Last-Modified"), date, strlen(date), 1, sent_header); efree(date); /* remember */ @@ -289,6 +293,7 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ /* multi range */ else { + size_t preface_len; char bound[23] = {0}, preface[1024] = {0}, multi_header[68] = "Content-Type: multipart/byteranges; boundary="; @@ -307,7 +312,7 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ 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" @@ -321,7 +326,7 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_ (ulong) size ); - PHPWRITE(preface, strlen(preface)); + PHPWRITE(preface, preface_len); http_send_chunk(data, Z_LVAL_PP(zbegin), Z_LVAL_PP(zend) + 1, mode); }