← Back to branch summary

~ubuntu-branches/ubuntu/hardy/nginx/hardy-backports

« back to all changes in this revision

Viewing changes to src/os/unix/ngx_recv.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Casadevall
  • Date: 2008-12-21 22:25:43 UTC
  • mfrom: (11.1.10 jaunty)
  • Revision ID: james.westby@ubuntu.com-20081221222543-44yu0i65ni6evses
Tags: 0.6.34-2ubuntu1~hardy1
https://launchpad.net/bugs/260640
* Source-level backport from jaunty to hardy of nginx (LP: #260640)
* debian/control:
  - Lowered lsb dependency to 3.2-4ubuntu1
* debian/init.d:
  - Removed usage of status_of_proc() to suite lower lsb

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/os/unix/ngx_recv.c
11
11
 
12
12
#if (NGX_HAVE_KQUEUE)
13
13
 
14
 
ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
14
ssize_t
 
15
ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
15
16
{
16
17
    ssize_t       n;
17
18
    ngx_err_t     err;
40
41
                return 0;
41
42
 
42
43
            } else {
 
44
                rev->ready = 0;
43
45
                return NGX_AGAIN;
44
46
            }
45
47
        }
77
79
                     * even if kqueue reported about available data
78
80
                     */
79
81
 
80
 
#if 0
81
 
                    ngx_log_error(NGX_LOG_ALERT, c->log, 0,
82
 
                                  "recv() returned 0 while kevent() reported "
83
 
                                  "%d available bytes", rev->available);
84
 
#endif
85
 
 
86
82
                    rev->eof = 1;
87
83
                    rev->available = 0;
88
84
                }
126
122
 
127
123
#else /* ! NGX_HAVE_KQUEUE */
128
124
 
129
 
ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
 
125
ssize_t
 
126
ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
130
127
{
131
128
    ssize_t       n;
132
129
    ngx_err_t     err;