diff options
Diffstat (limited to 'sapi/thttpd/thttpd_patch')
-rw-r--r-- | sapi/thttpd/thttpd_patch | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch deleted file mode 100644 index b5ce179ca2..0000000000 --- a/sapi/thttpd/thttpd_patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -ur thttpd-2.21/Makefile.in thttpd-2.21-p/Makefile.in ---- thttpd-2.21/Makefile.in Thu Mar 29 20:36:21 2001 -+++ thttpd-2.21-p/Makefile.in Sun Apr 22 15:59:42 2001 -@@ -46,13 +46,15 @@ - - # You shouldn't need to edit anything below here. - -+include php_makefile -+ - CC = @CC@ - CCOPT = @V_CCOPT@ - DEFS = @DEFS@ - INCLS = -I. - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LDFLAGS = @LDFLAGS@ $(PHP_LDFLAGS) -+LIBS = @LIBS@ $(PHP_LIBS) - NETLIBS = @V_NETLIBS@ - INSTALL = @INSTALL@ - -@@ -62,7 +64,7 @@ - @rm -f $@ - $(CC) $(CFLAGS) -c $*.c - --SRC = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c syslog.c -+SRC = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c syslog.c php_thttpd.c - - OBJ = $(SRC:.c=.o) @LIBOBJS@ - -@@ -151,6 +153,9 @@ - - tags: - ctags -wtd *.c *.h -+ -+php_thttpd.o: php_thttpd.c -+ $(CC) $(PHP_CFLAGS) $(CFLAGS) -c php_thttpd.c - - tar: - @name=`sed -n -e '/SERVER_SOFTWARE/!d' -e 's,.*thttpd/,thttpd-,' -e 's, .*,,p' version.h` ; \ -diff -ur thttpd-2.21/libhttpd.c thttpd-2.21-p/libhttpd.c ---- thttpd-2.21/libhttpd.c Sat Apr 21 02:11:32 2001 -+++ thttpd-2.21-p/libhttpd.c Sun Apr 22 16:01:41 2001 -@@ -85,6 +85,8 @@ - #include "match.h" - #include "tdate_parse.h" - -+#include "php_thttpd.h" -+ - #ifndef STDIN_FILENO - #define STDIN_FILENO 0 - #endif -@@ -243,6 +245,8 @@ - free( (void*) hs->cwd ); - if ( hs->cgi_pattern != (char*) 0 ) - free( (void*) hs->cgi_pattern ); -+ if ( hs->php_pattern != (char*) 0 ) -+ free( (void*) hs->php_pattern ); - if ( hs->charset != (char*) 0 ) - free( (void*) hs->charset ); - if ( hs->url_pattern != (char*) 0 ) -@@ -250,6 +254,7 @@ - if ( hs->local_pattern != (char*) 0 ) - free( (void*) hs->local_pattern ); - free( (void*) hs ); -+ thttpd_php_shutdown(); - } - - -@@ -313,6 +318,7 @@ - } - - hs->port = port; -+ hs->php_pattern = strdup("**.php"); - if ( cgi_pattern == (char*) 0 ) - hs->cgi_pattern = (char*) 0; - else -@@ -386,6 +392,8 @@ - return (httpd_server*) 0; - } - -+ thttpd_php_init(); -+ - /* Done initializing. */ - if ( hs->binding_hostname == (char*) 0 ) - syslog( LOG_INFO, "%.80s starting on port %d", SERVER_SOFTWARE, hs->port ); -@@ -2336,7 +2344,10 @@ - { - make_log_entry( hc, nowP ); - -- if ( hc->file_address != (char*) 0 ) -+ if ( hc->file_address == (char*) 1 ) -+ { -+ thttpd_closed_conn(hc->conn_fd); -+ } else if ( hc->file_address != (char*) 0 ) - { - mmc_unmap( hc->file_address, &(hc->sb), nowP ); - hc->file_address = (char*) 0; -@@ -3543,6 +3554,11 @@ - ( hc->sb.st_mode & S_IXOTH ) && - match( hc->hs->cgi_pattern, hc->expnfilename ) ) - return cgi( hc ); -+ -+ if ( hc->hs->php_pattern != (char*) 0 && -+ match( hc->hs->php_pattern, hc->expnfilename)) { -+ return thttpd_php_request( hc ); -+ } - - /* 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 -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 @@ - char* server_hostname; - int port; - char* cgi_pattern; -+ char* php_pattern; - char* charset; - char* cwd; - int listen4_fd, listen6_fd; -diff -ur thttpd-2.21/thttpd.c thttpd-2.21-p/thttpd.c ---- thttpd-2.21/thttpd.c Sun Apr 15 18:09:20 2001 -+++ thttpd-2.21-p/thttpd.c Sun Apr 22 15:59:42 2001 -@@ -1392,6 +1392,12 @@ - clear_connection( c, tvP ); - return; - } -+ if (hc->file_address == (char *) 1) { -+ tmr_cancel( c->idle_read_timer ); -+ c->idle_read_timer = (Timer*) 0; -+ c->wouldblock_delay = 0; -+ return; -+ } - if ( c->bytes_sent >= c->bytes_to_send ) - { - /* There's nothing to send. */ |