1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
diff -ur thttpd-2.19/Makefile.in thttpd-2.19-t/Makefile.in
--- thttpd-2.19/Makefile.in Tue Jul 4 18:21:32 2000
+++ thttpd-2.19-t/Makefile.in Mon Aug 7 15:34:41 2000
@@ -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.19/libhttpd.c thttpd-2.19-t/libhttpd.c
--- thttpd-2.19/libhttpd.c Fri Jun 23 05:43:40 2000
+++ thttpd-2.19-t/libhttpd.c Mon Aug 7 15:27:25 2000
@@ -75,6 +75,8 @@
#include "match.h"
#include "tdate_parse.h"
+#include "php_thttpd.h"
+
#ifndef STDIN_FILENO
#define STDIN_FILENO 0
#endif
@@ -224,6 +226,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 )
@@ -231,6 +235,7 @@
if ( hs->local_pattern != (char*) 0 )
free( (void*) hs->local_pattern );
free( (void*) hs );
+ thttpd_php_shutdown();
}
@@ -291,6 +296,7 @@
}
hs->port = port;
+ hs->php_pattern = strdup("**.php");
if ( cgi_pattern == (char*) 0 )
hs->cgi_pattern = (char*) 0;
else
@@ -379,6 +385,8 @@
int listen_fd;
int on, flags;
+ thttpd_php_init();
+
/* Create socket. */
listen_fd = socket( saP->sa.sa_family, SOCK_STREAM, 0 );
if ( listen_fd < 0 )
@@ -3302,6 +3310,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.19/libhttpd.h thttpd-2.19-t/libhttpd.h
--- thttpd-2.19/libhttpd.h Tue Jun 13 20:48:56 2000
+++ thttpd-2.19-t/libhttpd.h Mon Aug 7 15:33:08 2000
@@ -69,6 +69,7 @@
char* server_hostname;
int port;
char* cgi_pattern;
+ char* php_pattern;
char* charset;
char* cwd;
int listen4_fd, listen6_fd;
|
