archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update patch to thttpd-2.21

Browse source
This commit is contained in:
Sascha Schumann 2001-04-22 14:00:53 +00:00
parent 4d9660d3b9
commit 38e55b3249
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
sapi/thttpd/thttpd_patch
View file

@ -1,6 +1,6 @@
diff -Nur thttpd-2.20b/Makefile.in thttpd-2.20b-php/Makefile.in diff -ur thttpd-2.21/Makefile.in thttpd-2.21-p/Makefile.in
--- thttpd-2.20b/Makefile.in Tue Jul 4 18:21:32 2000 --- thttpd-2.21/Makefile.in Thu Mar 29 20:36:21 2001
+++ thttpd-2.20b-php/Makefile.in Mon Nov 13 14:25:48 2000 +++ thttpd-2.21-p/Makefile.in Sun Apr 22 15:59:42 2001
@@ -46,13 +46,15 @@ @@ -46,13 +46,15 @@
# You shouldn't need to edit anything below here. # You shouldn't need to edit anything below here.
@ -38,10 +38,10 @@ diff -Nur thttpd-2.20b/Makefile.in thttpd-2.20b-php/Makefile.in
tar: tar:
@name=`sed -n -e '/SERVER_SOFTWARE/!d' -e 's,.*thttpd/,thttpd-,' -e 's, .*,,p' version.h` ; \ @name=`sed -n -e '/SERVER_SOFTWARE/!d' -e 's,.*thttpd/,thttpd-,' -e 's, .*,,p' version.h` ; \
diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c diff -ur thttpd-2.21/libhttpd.c thttpd-2.21-p/libhttpd.c
--- thttpd-2.20b/libhttpd.c Wed Sep 27 20:13:24 2000 --- thttpd-2.21/libhttpd.c Sat Apr 21 02:11:32 2001
+++ thttpd-2.20b-php/libhttpd.c Mon Nov 13 14:25:57 2000 +++ thttpd-2.21-p/libhttpd.c Sun Apr 22 16:01:41 2001
@@ -75,6 +75,8 @@ @@ -85,6 +85,8 @@
#include "match.h" #include "match.h"
#include "tdate_parse.h" #include "tdate_parse.h"
@ -50,7 +50,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
#ifndef STDIN_FILENO #ifndef STDIN_FILENO
#define STDIN_FILENO 0 #define STDIN_FILENO 0
#endif #endif
@@ -225,6 +227,8 @@ @@ -243,6 +245,8 @@
free( (void*) hs->cwd ); free( (void*) hs->cwd );
if ( hs->cgi_pattern != (char*) 0 ) if ( hs->cgi_pattern != (char*) 0 )
free( (void*) hs->cgi_pattern ); free( (void*) hs->cgi_pattern );
@ -59,7 +59,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
if ( hs->charset != (char*) 0 ) if ( hs->charset != (char*) 0 )
free( (void*) hs->charset ); free( (void*) hs->charset );
if ( hs->url_pattern != (char*) 0 ) if ( hs->url_pattern != (char*) 0 )
@@ -232,6 +236,7 @@ @@ -250,6 +254,7 @@
if ( hs->local_pattern != (char*) 0 ) if ( hs->local_pattern != (char*) 0 )
free( (void*) hs->local_pattern ); free( (void*) hs->local_pattern );
free( (void*) hs ); free( (void*) hs );
@ -67,7 +67,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
} }
@@ -292,6 +297,7 @@ @@ -313,6 +318,7 @@
} }
hs->port = port; hs->port = port;
@ -75,7 +75,7 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
if ( cgi_pattern == (char*) 0 ) if ( cgi_pattern == (char*) 0 )
hs->cgi_pattern = (char*) 0; hs->cgi_pattern = (char*) 0;
else else
@@ -363,6 +369,8 @@ @@ -386,6 +392,8 @@
return (httpd_server*) 0; return (httpd_server*) 0;
} }
@ -83,19 +83,20 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
+ +
/* Done initializing. */ /* Done initializing. */
if ( hs->binding_hostname == (char*) 0 ) if ( hs->binding_hostname == (char*) 0 )
syslog( LOG_INFO, "%s starting on port %d", SERVER_SOFTWARE, hs->port ); syslog( LOG_INFO, "%.80s starting on port %d", SERVER_SOFTWARE, hs->port );
@@ -2167,7 +2175,9 @@ @@ -2336,7 +2344,10 @@
void
httpd_close_conn( httpd_conn* hc, struct timeval* nowP )
{ {
make_log_entry( hc, nowP );
- if ( hc->file_address != (char*) 0 ) - if ( hc->file_address != (char*) 0 )
+ if (hc->file_address == (char *) 1) { + if ( hc->file_address == (char*) 1 )
+ thttpd_closed_conn(hc->conn_fd); + {
+ } else if ( hc->file_address != (char*) 0 ) + thttpd_closed_conn(hc->conn_fd);
+ } else if ( hc->file_address != (char*) 0 )
{ {
mmc_unmap( hc->file_address, nowP, &(hc->sb) ); mmc_unmap( hc->file_address, &(hc->sb), nowP );
hc->file_address = (char*) 0; hc->file_address = (char*) 0;
@@ -3336,6 +3346,11 @@ @@ -3543,6 +3554,11 @@
( hc->sb.st_mode & S_IXOTH ) && ( hc->sb.st_mode & S_IXOTH ) &&
match( hc->hs->cgi_pattern, hc->expnfilename ) ) match( hc->hs->cgi_pattern, hc->expnfilename ) )
return cgi( hc ); return cgi( hc );
@ -107,9 +108,11 @@ diff -Nur thttpd-2.20b/libhttpd.c thttpd-2.20b-php/libhttpd.c
/* It's not CGI. If it's executable or there's pathinfo, someone's /* It's not CGI. If it's executable or there's pathinfo, someone's
** trying to either serve or run a non-CGI file as CGI. Either case ** trying to either serve or run a non-CGI file as CGI. Either case
diff -Nur thttpd-2.20b/libhttpd.h thttpd-2.20b-php/libhttpd.h Only in thttpd-2.21-p: libhttpd.c.rej
--- thttpd-2.20b/libhttpd.h Tue Jun 13 20:48:56 2000 Only in thttpd-2.21-p: libhttpd.c~
+++ thttpd-2.20b-php/libhttpd.h Mon Nov 13 14:25:48 2000 diff -ur thttpd-2.21/libhttpd.h thttpd-2.21-p/libhttpd.h
--- thttpd-2.21/libhttpd.h Fri Apr 13 07:37:17 2001
+++ thttpd-2.21-p/libhttpd.h Sun Apr 22 15:59:42 2001
@@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
char* server_hostname; char* server_hostname;
int port; int port;
@ -118,19 +121,20 @@ diff -Nur thttpd-2.20b/libhttpd.h thttpd-2.20b-php/libhttpd.h
char* charset; char* charset;
char* cwd; char* cwd;
int listen4_fd, listen6_fd; int listen4_fd, listen6_fd;
diff -Nur thttpd-2.20b/thttpd.c thttpd-2.20b-php/thttpd.c diff -ur thttpd-2.21/thttpd.c thttpd-2.21-p/thttpd.c
--- thttpd-2.20b/thttpd.c Wed Sep 27 21:31:48 2000 --- thttpd-2.21/thttpd.c Sun Apr 15 18:09:20 2001
+++ thttpd-2.20b-php/thttpd.c Mon Nov 13 14:25:57 2000 +++ thttpd-2.21-p/thttpd.c Sun Apr 22 15:59:42 2001
@@ -1332,6 +1333,12 @@ @@ -1392,6 +1392,12 @@
c->bytes_sent = hc->bytes;
clear_connection( c, tvP ); clear_connection( c, tvP );
return; return;
+ } }
+ if (hc->file_address == (char *) 1) { + if (hc->file_address == (char *) 1) {
+ tmr_cancel( c->idle_read_timer ); + tmr_cancel( c->idle_read_timer );
+ c->idle_read_timer = (Timer*) 0; + c->idle_read_timer = (Timer*) 0;
+ c->wouldblock_delay = 0; + c->wouldblock_delay = 0;
+ return; + return;
} + }
if ( c->bytes_sent >= c->bytes_to_send ) if ( c->bytes_sent >= c->bytes_to_send )
{ {
/* There's nothing to send. */
Only in thttpd-2.21-p: thttpd.c~