X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_send_api.c;h=0c1fe57cfdbcadbd0d12a6183ee6debf365837f3;hb=bb827588f8c9dcaf0cb81d43cfac74d9ca02b311;hp=10bcdc0ba3b83db4233b390f37166b4513dcc69b;hpb=c5daa65dcad8fd0a916038c7567f610ea34c6315;p=m6w6%2Fext-http diff --git a/http_send_api.c b/http_send_api.c index 10bcdc0..0c1fe57 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -35,28 +35,12 @@ static inline void _http_flush(void *nothing, const char *data, size_t data_len php_end_ob_buffer(1, 1 TSRMLS_CC); sapi_flush(TSRMLS_C); -#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_MSEC(HTTP_G->send.throttle_delay)); -#elif defined(HAVE_USLEEP) - 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_NSEC(HTTP_G->send.throttle_delay) % HTTP_NANOSEC; - - 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; - } +#if 0 + fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len); #endif + + if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) { + http_sleep(HTTP_G->send.throttle_delay); } } /* }}} */