/* {{{ static inline void http_sleep() */
static inline void _http_sleep(TSRMLS_D)
{
- if (HTTP_G(send).throttle_delay >= 0.001) {
+#define HTTP_MSEC(s) (s * 1000)
+#define HTTP_USEC(s) (HTTP_MSEC(s) * 1000)
+#define HTTP_NSEC(s) (HTTP_USEC(s) * 1000)
+#define HTTP_NANOSEC (1000 * 1000 * 1000)
+#define HTTP_DIFFSEC (0.001)
+
+ if (HTTP_G(send).throttle_delay >= HTTP_DIFFSEC) {
#if defined(PHP_WIN32)
- Sleep((DWORD) (HTTP_G(send).throttle_delay * 1000));
+ Sleep((DWORD) HTTP_MSEC(HTTP_G(send).throttle_delay));
#elif defined(HAVE_USLEEP)
- usleep(HTTP_G(send).throttle_delay * 1000000);
+ usleep(HTTP_USEC(HTTP_G(send).throttle_delay));
#elif defined(HAVE_NANOSLEEP)
struct timespec req, rem;
req.tv_sec = (time_t) HTTP_G(send).throttle_delay;
- req.tv_nsec = (HTTP_G(send).throttle_delay * 1000000000) % 1000000000;
+ req.tv_nsec = HTTP_NSEC(HTTP_G(send).throttle_delay) % HTTP_NANOSEC;
- while (nanosleep(&req, &rem) && (errno == EINTR) && (rem.tv_nsec > 1000000)) {
+ while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) {
req.tv_sec = rem.tv_sec;
req.tv_nsec = rem.tv_nsec;
}
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;
}
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;
}
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;
}
http_send_status(206);
/* send content range header */
- snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", **begin, **end, size);
+ snprintf(range_header, 255, "Content-Range: bytes %ld-%ld/%lu", **begin, **end, (ulong) size);
http_send_header(range_header);
/* send requested chunk */
http_send_status(206);
/* send multipart/byteranges header */
- snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
+ 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);
snprintf(preface, 1023,
HTTP_CRLF "%s"
HTTP_CRLF "Content-Type: %s"
- HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+ HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu"
HTTP_CRLF
HTTP_CRLF,
HTTP_G(send).content_type ? HTTP_G(send).content_type : "application/x-octetstream",
**begin,
**end,
- size
+ (ulong) size
);
PHPWRITE(preface, strlen(preface));
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);
if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {