Mercurial > hg > nginx-quic
view src/os/unix/ngx_socket.c @ 5110:0bbdd966a383
Request body: next upstream fix.
After introduction of chunked request body handling in 1.3.9 (r4931),
r->request_body->bufs buffers have b->start pointing to original buffer
start (and b->pos pointing to real data of this particular buffer).
While this is ok as per se, it caused bad things (usually original request
headers included before the request body) after reinit of the request
chain in ngx_http_upstream_reinit() while sending the request to a next
upstream server (which used to do b->pos = b->start for each buffer
in the request chain).
Patch by Piotr Sikora.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 14 Mar 2013 12:28:53 +0000 |
parents | d620f497c50f |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> /* * ioctl(FIONBIO) sets a non-blocking mode with the single syscall * while fcntl(F_SETFL, O_NONBLOCK) needs to learn the current state * using fcntl(F_GETFL). * * ioctl() and fcntl() are syscalls at least in FreeBSD 2.x, Linux 2.2 * and Solaris 7. * * ioctl() in Linux 2.4 and 2.6 uses BKL, however, fcntl(F_SETFL) uses it too. */ #if (NGX_HAVE_FIONBIO) int ngx_nonblocking(ngx_socket_t s) { int nb; nb = 1; return ioctl(s, FIONBIO, &nb); } int ngx_blocking(ngx_socket_t s) { int nb; nb = 0; return ioctl(s, FIONBIO, &nb); } #endif #if (NGX_FREEBSD) int ngx_tcp_nopush(ngx_socket_t s) { int tcp_nopush; tcp_nopush = 1; return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, (const void *) &tcp_nopush, sizeof(int)); } int ngx_tcp_push(ngx_socket_t s) { int tcp_nopush; tcp_nopush = 0; return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, (const void *) &tcp_nopush, sizeof(int)); } #elif (NGX_LINUX) int ngx_tcp_nopush(ngx_socket_t s) { int cork; cork = 1; return setsockopt(s, IPPROTO_TCP, TCP_CORK, (const void *) &cork, sizeof(int)); } int ngx_tcp_push(ngx_socket_t s) { int cork; cork = 0; return setsockopt(s, IPPROTO_TCP, TCP_CORK, (const void *) &cork, sizeof(int)); } #else int ngx_tcp_nopush(ngx_socket_t s) { return 0; } int ngx_tcp_push(ngx_socket_t s) { return 0; } #endif