head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE_20060622:1.3
	OPENPKG_2_STABLE:1.3.0.6
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_RELEASE:1.3
	OPENPKG_2_5_SOLID:1.3.0.4
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.2
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_CW_FP:1.3
	OPENPKG_2_3_RELEASE:1.2.2.1
	OPENPKG_2_3_SOLID:1.2.0.2
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.1
	OPENPKG_2_2_SOLID:1.1.0.2
	OPENPKG_2_2_SOLID_BP:1.1;
locks; strict;
comment	@# @;


1.3
date	2005.02.24.09.36.55;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2005.02.17.16.46.58;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2004.03.13.17.54.18;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2005.02.24.09.48.14;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@upgrading package: boa 0.94.14rc20 -> 0.94.14rc21
@
text
@Index: src/config.c
--- src/config.c.orig	2005-02-22 15:11:29 +0100
+++ src/config.c	2005-02-24 09:10:21 +0100
@@@@ -429,8 +429,11 @@@@
 
 static void trim(char *s)
 {
-    char *c = s + strlen(s) - 1;
+    char *c;
 
+    if (strlen(s) == 0)
+        return;
+    c = s + strlen(s) - 1;
     while (isspace(*c) && c > s) {
         *c = '\0';
         --c;
@@@@ -464,8 +467,9 @@@@
             c = NULL;
         } else {
             /* one or more args */
-            *c = '\0';
-            ++c;
+            *c++ = '\0';
+            while (isspace(*c))
+                c++;
         }
 
         p = lookup_keyword(buf);
Index: src/get.c
--- src/get.c.orig	2005-02-22 15:11:29 +0100
+++ src/get.c	2005-02-24 09:10:21 +0100
@@@@ -625,7 +625,7 @@@@
      */
     snprintf(pathname_with_index, sizeof(pathname_with_index),
              "%s/dir.%d.%ld", cachedir,
-             (int) statbuf->st_dev, statbuf->st_ino);
+             (int) statbuf->st_dev, (long)statbuf->st_ino);
     data_fd = open(pathname_with_index, O_RDONLY);
 
     if (data_fd != -1) {        /* index cache */
Index: src/globals.h
--- src/globals.h.orig	2005-02-22 15:11:29 +0100
+++ src/globals.h	2005-02-24 09:10:21 +0100
@@@@ -279,7 +279,7 @@@@
 extern unsigned total_connections;
 extern unsigned int system_bufsize;      /* Default size of SNDBUF given by system */
 
-extern sigjmp_buf env;
+extern jmp_buf env;
 extern int handle_sigbus;
 extern unsigned int cgi_umask;
 
Index: src/signals.c
--- src/signals.c.orig	2005-02-22 15:11:29 +0100
+++ src/signals.c	2005-02-24 09:10:21 +0100
@@@@ -29,7 +29,7 @@@@
 #endif
 #include <signal.h>             /* signal */
 
-sigjmp_buf env;
+jmp_buf env;
 int handle_sigbus;
 
 void sigsegv(int);
@@@@ -134,7 +134,7 @@@@
     abort();
 }
 
-extern sigjmp_buf env;
+extern jmp_buf env;
 extern int handle_sigbus;
 
 void sigbus(int dummy)
@


1.2
log
@fix compile warnings; add minimum mime type config; tag config files as such
@
text
@a0 15
Index: src/boa.c
--- src/boa.c.orig	2004-06-04 04:36:33 +0200
+++ src/boa.c	2005-02-17 17:37:18 +0100
@@@@ -55,10 +55,7 @@@@
     pid_t pid;
 
     /* set umask to u+rw, u-x, go-rwx */
-    if (umask(077) < 0) {
-        perror("umask");
-        exit(EXIT_FAILURE);
-    }
+    umask(077);
 
     /* but first, update timestamp, because log_error_time uses it */
     (void) time(&current_time);
d2 3
a4 3
--- src/config.c.orig	2004-06-04 04:49:13 +0200
+++ src/config.c	2005-02-17 17:34:28 +0100
@@@@ -428,8 +428,11 @@@@
d17 1
a17 1
@@@@ -463,8 +466,9 @@@@
d30 2
a31 2
--- src/get.c.orig	2004-06-10 03:55:39 +0200
+++ src/get.c	2005-02-17 17:40:25 +0100
d42 2
a43 2
--- src/globals.h.orig	2004-03-05 04:41:33 +0100
+++ src/globals.h	2005-02-17 17:40:03 +0100
d54 2
a55 2
--- src/signals.c.orig	2004-06-04 04:49:13 +0200
+++ src/signals.c	2005-02-17 17:40:48 +0100
@


1.2.2.1
log
@MFC: merge latest changes from CURRENT
@
text
@d1 15
d17 3
a19 3
--- src/config.c.orig	2005-02-22 15:11:29 +0100
+++ src/config.c	2005-02-24 09:10:21 +0100
@@@@ -429,8 +429,11 @@@@
d32 1
a32 1
@@@@ -464,8 +467,9 @@@@
d45 2
a46 2
--- src/get.c.orig	2005-02-22 15:11:29 +0100
+++ src/get.c	2005-02-24 09:10:21 +0100
d57 2
a58 2
--- src/globals.h.orig	2005-02-22 15:11:29 +0100
+++ src/globals.h	2005-02-24 09:10:21 +0100
d69 2
a70 2
--- src/signals.c.orig	2005-02-22 15:11:29 +0100
+++ src/signals.c	2005-02-24 09:10:21 +0100
@


1.1
log
@new package: boa 0.94.14rc18 (Small HTTP Server)
@
text
@d1 15
d17 3
a19 3
--- src/config.c.orig	2003-12-09 05:17:22.000000000 +0100
+++ src/config.c	2004-03-13 18:42:45.000000000 +0100
@@@@ -419,8 +419,11 @@@@
d32 1
a32 1
@@@@ -454,8 +457,9 @@@@
d44 45
@