Changeset 5841

Timestamp:

May 16, 2008, 4:53:11 AM (14 years ago)

Author:

charles

Message:

• add some #ifdefs to fix -DNO_SSI
• remove the Win CE stuff for now, since we don't support Windows yet.

Location:

trunk/third-party/shttpd

Files:

• Makefile (deleted)
• Makefile.am (modified) (2 diffs)
• compat_win32.c (deleted)
• compat_win32.h (deleted)
• compat_wince.c (deleted)
• compat_wince.h (deleted)
• config.c (modified) (1 diff)
• config.h (modified) (1 diff)
• defs.h (modified) (2 diffs)
• io_ssi.c (deleted)
• shttpd.c (modified) (1 diff)

trunk/third-party/shttpd/Makefile.am

@@ -1 @@
-
-# FIXME: build the compat_*.c files conditionally
 
 noinst_LIBRARIES = libshttpd.a
 
+AM_CPPFLAGS = -DEMBEDDED -DNDEBUG -DNO_CGI -DNO_SSI
+
 libshttpd_a_SOURCES = \
-    string.c shttpd.c log.c auth.c md5.c cgi.c config.c io_ssi.c \
+    string.c shttpd.c log.c auth.c md5.c cgi.c config.c \
     io_file.c io_socket.c io_ssl.c io_emb.c io_dir.c io_cgi.c \
     compat_unix.c
@@ -11 +11 @@
 noinst_HEADERS = \
     defs.h llist.h shttpd.h std_includes.h io.h md5.h ssl.h \
-    compat_unix.h compat_win32.h compat_rtems.h config.h
+    compat_unix.h compat_rtems.h config.h
 
 extra_DIST = \

trunk/third-party/shttpd/config.c

@@ -297 +297 @@
         LL_INIT(&ctx->error_handlers);
         LL_INIT(&ctx->acl);
+#if !defined(NO_SSI)
         LL_INIT(&ctx->ssi_funcs);
+#endif
         LL_INIT(&ctx->listeners);
 

trunk/third-party/shttpd/config.h

@@ -12 +12 @@
 #define CONFIG_HEADER_DEFINED
 
+#undef VERSION 
 #define VERSION         "1.39"          /* Version                      */
 #define CONFIG_FILE     "shttpd.conf"   /* Configuration file           */
 #define HTPASSWD        ".htpasswd"     /* Passwords file name          */
-#define URI_MAX         16384           /* Default max request size     */
+#define URI_MAX         65536           /* Default max request size     */
 #define LISTENING_PORTS "80"            /* Default listening ports      */
 #define INDEX_FILES     "index.html,index.htm,index.php,index.cgi"

trunk/third-party/shttpd/defs.h

@@ -242 +242 @@
         struct llhead   error_handlers; /* Embedded error handlers      */
         struct llhead   acl;            /* Access control list          */
+#if !defined(NO_SSI)
         struct llhead   ssi_funcs;      /* SSI callback functions       */
+#endif
         struct llhead   listeners;      /* Listening sockets            */
 
@@ -359 +361 @@
 extern struct registered_uri *is_registered_uri(struct shttpd_ctx *,
                 const char *uri);
+#if !defined(NO_SSI)
 extern void     do_ssi(struct conn *);
 extern void     ssi_func_destructor(struct llhead *lp);
+#endif
 
 /*

trunk/third-party/shttpd/shttpd.c

@@ -1206 +1206 @@
         free_list(&ctx->acl, acl_destructor);
         free_list(&ctx->listeners, listener_destructor);
+#if !defined(NO_SSI)
         free_list(&ctx->ssi_funcs, ssi_func_destructor);
+#endif
 
         for (i = 0; i < NELEMS(ctx->options); i++)