Skip to content

Update to version 2.29 from ACME source code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
petergaal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to version 2.29 from ACME source code #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Red Hat:
On Red Hat Linux systems you can use RPM to install thttpd, like so:

cd /usr/src/redhat/SOURCES
wget http://www.acme.com/software/thttpd/thttpd-2.28.tar.gz
rpm -ta thttpd-2.28.tar.gz
rpm -i /usr/src/redhat/RPMS/i386/thttpd-2.28-1.i386.rpm
wget http://www.acme.com/software/thttpd/thttpd-2.29.tar.gz
rpm -ta thttpd-2.29.tar.gz
rpm -i /usr/src/redhat/RPMS/i386/thttpd-2.29-1.i386.rpm


Solaris:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ tinyhttpd
This is a github mirror of thttpd (http://www.acme.com/software/thttpd/)

thttpd - tiny/turbo/throttling HTTP server
version 2.28 of 04Feb2018
version 2.29 of 23May2018

thttpd is a simple, small, portable, fast, and secure HTTP server.

Expand Down
2 changes: 1 addition & 1 deletion contrib/redhat-rpm/thttpd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: Throttleable lightweight httpd server
Name: thttpd
Version: 2.28
Version: 2.29
Release: 1
Group: Networking
URL: http://www.acme.com/software/thttpd
Expand Down
99 changes: 49 additions & 50 deletions libhttpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,9 @@ httpd_method_str( int method )
case METHOD_GET: return "GET";
case METHOD_HEAD: return "HEAD";
case METHOD_POST: return "POST";
case METHOD_PUT: return "PUT";
case METHOD_DELETE: return "DELETE";
case METHOD_TRACE: return "TRACE";
default: return "UNKNOWN";
}
}
Expand Down Expand Up @@ -2028,6 +2031,12 @@ httpd_parse_request( httpd_conn* hc )
hc->method = METHOD_HEAD;
else if ( strcasecmp( method_str, httpd_method_str( METHOD_POST ) ) == 0 )
hc->method = METHOD_POST;
else if ( strcasecmp( method_str, httpd_method_str( METHOD_PUT ) ) == 0 )
hc->method = METHOD_PUT;
else if ( strcasecmp( method_str, httpd_method_str( METHOD_DELETE ) ) == 0 )
hc->method = METHOD_DELETE;
else if ( strcasecmp( method_str, httpd_method_str( METHOD_TRACE ) ) == 0 )
hc->method = METHOD_TRACE;
else
{
httpd_send_err( hc, 501, err501title, "", err501form, method_str );
Expand Down Expand Up @@ -3567,54 +3576,45 @@ cgi( httpd_conn* hc )
int r;
ClientData client_data;

if ( hc->method == METHOD_GET || hc->method == METHOD_POST )
if ( hc->hs->cgi_limit != 0 && hc->hs->cgi_count >= hc->hs->cgi_limit )
{
if ( hc->hs->cgi_limit != 0 && hc->hs->cgi_count >= hc->hs->cgi_limit )
{
httpd_send_err(
hc, 503, httpd_err503title, "", httpd_err503form,
hc->encodedurl );
return -1;
}
++hc->hs->cgi_count;
httpd_clear_ndelay( hc->conn_fd );
r = fork( );
if ( r < 0 )
{
syslog( LOG_ERR, "fork - %m" );
httpd_send_err(
hc, 500, err500title, "", err500form, hc->encodedurl );
return -1;
}
if ( r == 0 )
{
/* Child process. */
sub_process = 1;
httpd_unlisten( hc->hs );
cgi_child( hc );
}

/* Parent process. */
syslog( LOG_DEBUG, "spawned CGI process %d for file '%.200s'", r, hc->expnfilename );
#ifdef CGI_TIMELIMIT
/* Schedule a kill for the child process, in case it runs too long */
client_data.i = r;
if ( tmr_create( (struct timeval*) 0, cgi_kill, client_data, CGI_TIMELIMIT * 1000L, 0 ) == (Timer*) 0 )
{
syslog( LOG_CRIT, "tmr_create(cgi_kill child) failed" );
exit( 1 );
}
#endif /* CGI_TIMELIMIT */
hc->status = 200;
hc->bytes_sent = CGI_BYTECOUNT;
hc->should_linger = 0;
httpd_send_err(
hc, 503, httpd_err503title, "", httpd_err503form,
hc->encodedurl );
return -1;
}
else
++hc->hs->cgi_count;
httpd_clear_ndelay( hc->conn_fd );
r = fork( );
if ( r < 0 )
{
syslog( LOG_ERR, "fork - %m" );
httpd_send_err(
hc, 501, err501title, "", err501form, httpd_method_str( hc->method ) );
hc, 500, err500title, "", err500form, hc->encodedurl );
return -1;
}
if ( r == 0 )
{
/* Child process. */
sub_process = 1;
httpd_unlisten( hc->hs );
cgi_child( hc );
}

/* Parent process. */
syslog( LOG_DEBUG, "spawned CGI process %d for file '%.200s'", r, hc->expnfilename );
#ifdef CGI_TIMELIMIT
/* Schedule a kill for the child process, in case it runs too long */
client_data.i = r;
if ( tmr_create( (struct timeval*) 0, cgi_kill, client_data, CGI_TIMELIMIT * 1000L, 0 ) == (Timer*) 0 )
{
syslog( LOG_CRIT, "tmr_create(cgi_kill child) failed" );
exit( 1 );
}
#endif /* CGI_TIMELIMIT */
hc->status = 200;
hc->bytes_sent = CGI_BYTECOUNT;
hc->should_linger = 0;

return 0;
}
Expand All @@ -3637,14 +3637,6 @@ really_start_request( httpd_conn* hc, struct timeval* nowP )

expnlen = strlen( hc->expnfilename );

if ( hc->method != METHOD_GET && hc->method != METHOD_HEAD &&
hc->method != METHOD_POST )
{
httpd_send_err(
hc, 501, err501title, "", err501form, httpd_method_str( hc->method ) );
return -1;
}

/* Stat the file. */
if ( stat( hc->expnfilename, &hc->sb ) < 0 )
{
Expand Down Expand Up @@ -3855,6 +3847,13 @@ really_start_request( httpd_conn* hc, struct timeval* nowP )
return -1;
}

if ( hc->method != METHOD_GET && hc->method != METHOD_HEAD )
{
httpd_send_err(
hc, 501, err501title, "", err501form, httpd_method_str( hc->method ) );
return -1;
}

/* Fill in last_byte_index, if necessary. */
if ( hc->got_range &&
( hc->last_byte_index == -1 || hc->last_byte_index >= hc->sb.st_size ) )
Expand Down
3 changes: 3 additions & 0 deletions libhttpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ typedef struct {
#define METHOD_GET 1
#define METHOD_HEAD 2
#define METHOD_POST 3
#define METHOD_PUT 4
#define METHOD_DELETE 5
#define METHOD_TRACE 6

/* States for checked_state. */
#define CHST_FIRSTWORD 0
Expand Down
15 changes: 0 additions & 15 deletions samples/form.html
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions samples/formPost.c
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions samples/formPost.html
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions samples/index.html
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions samples/mult.c
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions samples/simplecgi.c
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions samples/viewData.c
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions thttpd.conf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_

#define SERVER_SOFTWARE "thttpd/2.28 04Feb2018"
#define SERVER_SOFTWARE "thttpd/2.29 23May2018"
#define SERVER_ADDRESS "http://www.acme.com/software/thttpd/"

#endif /* _VERSION_H_ */