diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /net/khttpd | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'net/khttpd')
| -rw-r--r-- | net/khttpd/security.c | 6 | ||||
| -rw-r--r-- | net/khttpd/sockets.c | 1 | ||||
| -rw-r--r-- | net/khttpd/waitheaders.c | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/net/khttpd/security.c b/net/khttpd/security.c index 7e0780a26..16503ceb5 100644 --- a/net/khttpd/security.c +++ b/net/khttpd/security.c @@ -115,14 +115,12 @@ struct file *OpenFileForSecurity(char *Filename) lock_kernel(); - filp = filp_open(Filename, 0, O_RDONLY, NULL); + filp = filp_open(Filename, O_RDONLY, 0); unlock_kernel(); - if ((IS_ERR(filp))||(filp==NULL)||(filp->f_dentry==NULL)) - { + if (IS_ERR(filp)) return NULL; - } #ifndef BENCHMARK permission = filp->f_dentry->d_inode->i_mode; diff --git a/net/khttpd/sockets.c b/net/khttpd/sockets.c index 60e66fdf8..74bfe614d 100644 --- a/net/khttpd/sockets.c +++ b/net/khttpd/sockets.c @@ -79,7 +79,6 @@ int StartListening(const int Port) error=sock->ops->listen(sock,48); if (error!=0) (void)printk(KERN_ERR "kHTTPd: Error listening on socket \n"); - sock->flags |= SO_ACCEPTCON; MainSocket = sock; diff --git a/net/khttpd/waitheaders.c b/net/khttpd/waitheaders.c index 47fa1581d..2c24f3744 100644 --- a/net/khttpd/waitheaders.c +++ b/net/khttpd/waitheaders.c @@ -239,7 +239,6 @@ static int DecodeHeader(const int CPUNR, struct http_request *Request) return 0; } else - if ((Request->filp->f_dentry!=NULL)&&(Request->filp->f_dentry->d_inode!=NULL)) { Request->FileLength = (int)Request->filp->f_dentry->d_inode->i_size; Request->Time = Request->filp->f_dentry->d_inode->i_mtime; @@ -262,12 +261,6 @@ static int DecodeHeader(const int CPUNR, struct http_request *Request) } - } else - { - /* Ehhh... */ - - printk(KERN_CRIT "kHTTPd: Unexpected filesystem response\n"); - return -1; } LeaveFunction("DecodeHeader"); |