Changeset 5841


Ignore:
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:
6 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/third-party/shttpd/Makefile.am

    r5822 r5841  
    1 
    2 # FIXME: build the compat_*.c files conditionally
    31
    42noinst_LIBRARIES = libshttpd.a
    53
     4AM_CPPFLAGS = -DEMBEDDED -DNDEBUG -DNO_CGI -DNO_SSI
     5
    66libshttpd_a_SOURCES = \
    7     string.c shttpd.c log.c auth.c md5.c cgi.c config.c io_ssi.c \
     7    string.c shttpd.c log.c auth.c md5.c cgi.c config.c \
    88    io_file.c io_socket.c io_ssl.c io_emb.c io_dir.c io_cgi.c \
    99    compat_unix.c
     
    1111noinst_HEADERS = \
    1212    defs.h llist.h shttpd.h std_includes.h io.h md5.h ssl.h \
    13     compat_unix.h compat_win32.h compat_rtems.h config.h
     13    compat_unix.h compat_rtems.h config.h
    1414
    1515extra_DIST = \
  • trunk/third-party/shttpd/config.c

    r5822 r5841  
    297297        LL_INIT(&ctx->error_handlers);
    298298        LL_INIT(&ctx->acl);
     299#if !defined(NO_SSI)
    299300        LL_INIT(&ctx->ssi_funcs);
     301#endif
    300302        LL_INIT(&ctx->listeners);
    301303
  • trunk/third-party/shttpd/config.h

    r5822 r5841  
    1212#define CONFIG_HEADER_DEFINED
    1313
     14#undef VERSION
    1415#define VERSION         "1.39"          /* Version                      */
    1516#define CONFIG_FILE     "shttpd.conf"   /* Configuration file           */
    1617#define HTPASSWD        ".htpasswd"     /* Passwords file name          */
    17 #define URI_MAX         16384           /* Default max request size     */
     18#define URI_MAX         65536           /* Default max request size     */
    1819#define LISTENING_PORTS "80"            /* Default listening ports      */
    1920#define INDEX_FILES     "index.html,index.htm,index.php,index.cgi"
  • trunk/third-party/shttpd/defs.h

    r5822 r5841  
    242242        struct llhead   error_handlers; /* Embedded error handlers      */
    243243        struct llhead   acl;            /* Access control list          */
     244#if !defined(NO_SSI)
    244245        struct llhead   ssi_funcs;      /* SSI callback functions       */
     246#endif
    245247        struct llhead   listeners;      /* Listening sockets            */
    246248
     
    359361extern struct registered_uri *is_registered_uri(struct shttpd_ctx *,
    360362                const char *uri);
     363#if !defined(NO_SSI)
    361364extern void     do_ssi(struct conn *);
    362365extern void     ssi_func_destructor(struct llhead *lp);
     366#endif
    363367
    364368/*
  • trunk/third-party/shttpd/shttpd.c

    r5822 r5841  
    12061206        free_list(&ctx->acl, acl_destructor);
    12071207        free_list(&ctx->listeners, listener_destructor);
     1208#if !defined(NO_SSI)
    12081209        free_list(&ctx->ssi_funcs, ssi_func_destructor);
     1210#endif
    12091211
    12101212        for (i = 0; i < NELEMS(ctx->options); i++)
Note: See TracChangeset for help on using the changeset viewer.