diff options
| author |   beck <beck@openbsd.org> | 2000-03-19 11:16:13 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2000-03-19 11:16:13 +0000 |
| commit | 7162a7a1f02eb4e2e0065733ca2d04d7558e49e4 (patch) | |
| tree | 97e4405d808cb4f9cd304e4ef041b1b542fdb0d8 /usr.sbin/httpd/src/modules/ssl/ssl_util.c | |
| parent | new minty 0.9.5 openssl (diff) | |
| download | wireguard-openbsd-7162a7a1f02eb4e2e0065733ca2d04d7558e49e4.tar.xz wireguard-openbsd-7162a7a1f02eb4e2e0065733ca2d04d7558e49e4.zip | |
apache 1.3.12 + mod_ssl 2.6.2 merge
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_util.c')
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_util.c b/usr.sbin/httpd/src/modules/ssl/ssl_util.c index bfc9e5fcc3e..ce238a52389 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_util.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_util.c @@ -241,7 +241,7 @@ int ssl_util_ppopen_child(void *cmd, child_info *pinfo) } #elif defined(OS2) /* IBM OS/2 */ - execl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL); + spawnl(P_NOWAIT, SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL); #else /* Standard Unix */ execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL); @@ -269,7 +269,7 @@ char *ssl_util_readfilter(server_rec *s, pool *p, char *cmd) return NULL; for (k = 0; read(fileno(fp), &c, 1) == 1 && (k < MAX_STRING_LEN-1) ; ) { - if (c == '\n') + if (c == '\n' || c == '\r') break; buf[k++] = c; } |