diff options
Diffstat (limited to 'www/twhttpd/files')
-rw-r--r-- | www/twhttpd/files/patch-base64.c | 10 | ||||
-rw-r--r-- | www/twhttpd/files/patch-cfg_functions.c | 38 | ||||
-rw-r--r-- | www/twhttpd/files/patch-cfg_parser.l | 13 | ||||
-rw-r--r-- | www/twhttpd/files/patch-cfg_parser.y | 59 | ||||
-rw-r--r-- | www/twhttpd/files/patch-config.h | 11 | ||||
-rw-r--r-- | www/twhttpd/files/patch-htpasswd.c | 10 | ||||
-rw-r--r-- | www/twhttpd/files/patch-httplog.c | 25 | ||||
-rw-r--r-- | www/twhttpd/files/patch-twhttpd.c | 32 | ||||
-rw-r--r-- | www/twhttpd/files/pkg-message.in | 5 |
9 files changed, 0 insertions, 203 deletions
diff --git a/www/twhttpd/files/patch-base64.c b/www/twhttpd/files/patch-base64.c deleted file mode 100644 index 225c75284714..000000000000 --- a/www/twhttpd/files/patch-base64.c +++ /dev/null @@ -1,10 +0,0 @@ ---- base64.c.orig Sun Feb 4 20:11:49 2007 -+++ base64.c Sun Feb 4 20:11:59 2007 -@@ -40,6 +40,7 @@ - #include <stdio.h> - #include <errno.h> - #include <stdlib.h> -+#include <string.h> - #include <unistd.h> - - #include "config.h" diff --git a/www/twhttpd/files/patch-cfg_functions.c b/www/twhttpd/files/patch-cfg_functions.c deleted file mode 100644 index aa9658ca370f..000000000000 --- a/www/twhttpd/files/patch-cfg_functions.c +++ /dev/null @@ -1,38 +0,0 @@ ---- cfg_functions.c.orig Tue Feb 12 22:29:15 2002 -+++ cfg_functions.c Sun Feb 4 20:07:31 2007 -@@ -25,14 +25,16 @@ - #include <ctype.h> - #include <errno.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> - #include <fnmatch.h> - #include <regex.h> - #include <syslog.h> - #include <unistd.h> --#include <arpa/inet.h> --#include <sys/socket.h> - #include <sys/types.h> -+#include <sys/socket.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - - #include "y.tab.h" - #include "twhttpd.h" -@@ -588,14 +590,14 @@ - // change forward destination - int cfg_set_forward(http_header *hd, void *value, void *value2, int property) - { -- (void *)hd->forward = (void *)value; -+ hd->forward = (struct sockaddr_in *)value; - return 1; - } - - // change web or proxy mode - int cfg_set_forward_proxy(http_header *hd, void *value, void *value2, int property) - { -- (void *)hd->forward_proxy = (void *)value; -+ hd->forward_proxy = (int *)value; - return 1; - } - diff --git a/www/twhttpd/files/patch-cfg_parser.l b/www/twhttpd/files/patch-cfg_parser.l deleted file mode 100644 index a39e99437810..000000000000 --- a/www/twhttpd/files/patch-cfg_parser.l +++ /dev/null @@ -1,13 +0,0 @@ ---- cfg_parser.l.orig Sun Feb 4 20:01:24 2007 -+++ cfg_parser.l Sun Feb 4 20:11:01 2007 -@@ -22,7 +22,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - */ -- -+ -+#include <string.h> -+ - #include "y.tab.h" - - int yylineno=1; diff --git a/www/twhttpd/files/patch-cfg_parser.y b/www/twhttpd/files/patch-cfg_parser.y deleted file mode 100644 index 415480a32da2..000000000000 --- a/www/twhttpd/files/patch-cfg_parser.y +++ /dev/null @@ -1,59 +0,0 @@ ---- cfg_parser.y.orig Sat Aug 31 11:41:16 2002 -+++ cfg_parser.y Sun Feb 4 20:06:36 2007 -@@ -27,10 +27,12 @@ - #include <regex.h> - #include <errno.h> - #include <stdio.h> --#include <arpa/inet.h> -+#include <stdlib.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - - #include "config.h" - #include "cfg_functions.h" -@@ -467,8 +469,8 @@ - $$ = (decision_tree *)cf_malloc(sizeof(decision_tree)); - init_dt($$); - $$->f = &cfg_numeric_test; -- (cfg_variable *)$$->value = $1; -- (int *)$$->value2 = (int *)cf_malloc(sizeof(int)); -+ $$->value = $1; -+ $$->value2 = cf_malloc(sizeof(int)); - *(int *)$$->value2 = $3; - $$->property = $2; - } -@@ -563,7 +565,7 @@ - $$ = (decision_tree *)cf_malloc(sizeof(decision_tree)); - init_dt($$); - $$->f = &cfg_set_location; -- (char *)$$->value = strdup($3); -+ $$->value = strdup($3); - } - ; - -@@ -623,19 +625,19 @@ - - num_var: PORT - { -- (cfg_variable *)$$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); -+ $$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); - $$->type = PORT; - $$->f = NULL; - } - | POST_LEN - { -- (cfg_variable *)$$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); -+ $$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); - $$->type = POST_LEN; - $$->f = NULL; - } - | STRLEN '(' str_var ')' - { -- (cfg_variable *)$$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); -+ $$ = (cfg_variable *)cf_malloc(sizeof(cfg_variable)); - $$->type = $3; - $$->f = &cfg_strlen; - } diff --git a/www/twhttpd/files/patch-config.h b/www/twhttpd/files/patch-config.h deleted file mode 100644 index a473487d2c78..000000000000 --- a/www/twhttpd/files/patch-config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.orig Sat Aug 31 05:40:23 2002 -+++ config.h Wed Sep 25 12:01:58 2002 -@@ -31,7 +31,7 @@ - #define CURRENT_DIR "./" - #define DEFAULT_CACHE_DIR ".cache" - #define DEFAULT_COOKIE_DIR ".cookie" --#define DEFAULT_CONFIG_FILE "/etc/twhttpd.cfg" -+#define DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/twhttpd.cfg" - - #define SOCKET_TIMEOUT 45 /* socket timeout value */ - #define CONNECT_TIMEOUT 15 /* connect timeout value */ diff --git a/www/twhttpd/files/patch-htpasswd.c b/www/twhttpd/files/patch-htpasswd.c deleted file mode 100644 index d002db7ceeb3..000000000000 --- a/www/twhttpd/files/patch-htpasswd.c +++ /dev/null @@ -1,10 +0,0 @@ ---- htpasswd.c.orig Sun Feb 4 20:13:04 2007 -+++ htpasswd.c Sun Feb 4 20:12:32 2007 -@@ -41,6 +41,7 @@ - #include <errno.h> - #include <unistd.h> - #include <stdlib.h> -+#include <string.h> - #include <pwd.h> - - #define MAX_PASS 32 diff --git a/www/twhttpd/files/patch-httplog.c b/www/twhttpd/files/patch-httplog.c deleted file mode 100644 index 2224be7921d4..000000000000 --- a/www/twhttpd/files/patch-httplog.c +++ /dev/null @@ -1,25 +0,0 @@ ---- httplog.c.orig Sat Dec 8 22:15:44 2001 -+++ httplog.c Sun Feb 4 20:10:16 2007 -@@ -39,11 +39,13 @@ - - #include <time.h> - #include <stdio.h> -+#include <string.h> - #include <syslog.h> -+#include <sys/types.h> -+#include <sys/socket.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - #include <sys/time.h> --#include <sys/socket.h> --#include <sys/types.h> - - #include "config.h" - #include "structs.h" -@@ -151,4 +153,4 @@ - } - } - } --} -\ No newline at end of file -+} diff --git a/www/twhttpd/files/patch-twhttpd.c b/www/twhttpd/files/patch-twhttpd.c deleted file mode 100644 index c13ee3eb73db..000000000000 --- a/www/twhttpd/files/patch-twhttpd.c +++ /dev/null @@ -1,32 +0,0 @@ ---- twhttpd.c.orig Tue Apr 1 12:06:08 2003 -+++ twhttpd.c Sun Feb 4 20:07:02 2007 -@@ -28,15 +28,17 @@ - #include <netdb.h> - #include <regex.h> - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - #include <syslog.h> - #include <signal.h> - #include <time.h> - #include <unistd.h> --#include <wait.h> --#include <netinet/in.h> --#include <sys/socket.h> -+#include <sys/wait.h> - #include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> - #include <sys/stat.h> - #include <sys/time.h> - -@@ -4014,7 +4016,7 @@ - lz_flush(hd->fd, &hd->fd_lzb); - } - syslog(LOG_ERR, "Exiting Testing Server\n"); -- exit; -+ exit(0); - } - - ////////////////////////////////////////////////////////////////////// diff --git a/www/twhttpd/files/pkg-message.in b/www/twhttpd/files/pkg-message.in deleted file mode 100644 index aed58788d127..000000000000 --- a/www/twhttpd/files/pkg-message.in +++ /dev/null @@ -1,5 +0,0 @@ -*************************************************************************** -twhttpd is installed in %%PREFIX%%/sbin/ -Now copy %%PREFIX%%/etc/twhttpd.cfg.sample to twhttpd.cfg, -and edit it. -*************************************************************************** |