diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-10 04:05:29 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-10 04:05:29 +0000 |
| commit | 9373f0969b465b88d9404cb16ef85b269b8e2cb2 (patch) | |
| tree | a8151f3fcddb09f04cb0802f7718c0d2aaad0ed5 /www/w3c-httpd/files/patch-SSL | |
| parent | Update master site. (diff) | |
Port is no longer broken for ELF. Also turn off DEBUG and handle FD sets
properly.
PR: 11606
Submitted by: Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>
Diffstat (limited to '')
| -rw-r--r-- | www/w3c-httpd/files/patch-SSL | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/w3c-httpd/files/patch-SSL b/www/w3c-httpd/files/patch-SSL index fea2f33d83df..cb736267ba8c 100644 --- a/www/w3c-httpd/files/patch-SSL +++ b/www/w3c-httpd/files/patch-SSL @@ -363,19 +363,19 @@ PATCH TO WWW COMMON LIBRARY 2.17 AND CERN HTTPD 3.0: + fd_set rd_fds, wr_fds; + int status; + -+ memset(&rd_fds, 0, sizeof(rd_fds)); -+ memset(&wr_fds, 0, sizeof(wr_fds)); -+ + if (initial && *initial) { + strcpy(b1, initial); + c1 = strlen(initial); + } + + while (1) { -+ FD_SET(sd1, &rd_fds); -+ FD_SET(sd2, &rd_fds); -+ FD_SET(sd1, &wr_fds); -+ FD_SET(sd2, &wr_fds); ++ FD_ZERO(&rd_fds); ++ FD_ZERO(&wr_fds); ++ /* Only set the FDs that are relevant - 10/12/98 gram@cdsec.com */ ++ if (!c1) FD_SET(sd2, &rd_fds); ++ else FD_SET(sd1, &wr_fds); ++ if (!c2) FD_SET(sd1, &rd_fds); ++ else FD_SET(sd2, &wr_fds); + + if (!(status = select(n_fds, &rd_fds, &wr_fds, NULL, NULL))) + { @@ -404,12 +404,12 @@ PATCH TO WWW COMMON LIBRARY 2.17 AND CERN HTTPD 3.0: + if (shove_buffer(sd2, b2, &i2, &c2) == -1) + closed2 = 1; + } -+ if (r1 && !c2) ++ if (r1) + { + if (!drag_buffer(sd1, b2, &i2, &c2)) + closed1 = 1; + } -+ if (r2 && !c1) ++ if (r2) + { + if (!drag_buffer(sd2, b1, &i1, &c1)) + closed2 = 1; |