@@ -286,14 +286,14 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print -ACLOCAL = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9 +ACLOCAL = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9 AMDEP_FALSE = # AMDEP_TRUE = -AMTAR = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run tar -AUTOCONF = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf -AUTOHEADER = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader -AUTOMAKE = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9 -AWK = gawk +AMTAR = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run tar +AUTOCONF = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf +AUTOHEADER = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader +AUTOMAKE = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9 +AWK = awk CC = gcc CCDEPMODE = depmode=gcc3 CFLAGS = -g -O2 @@ -316,7 +316,7 @@ LDFLAGS = LIBOBJS = ${LIBOBJDIR}lstat$U.o LIBS = LTLIBOBJS = ${LIBOBJDIR}lstat$U.lo -MAKEINFO = ${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo +MAKEINFO = ${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo OBJEXT = o PACKAGE = highlander PACKAGE_BUGREPORT = boa@metasystems.no @@ -349,7 +349,7 @@ host_alias = htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/install-sh +install_sh = /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/install-sh libdir = ${exec_prefix}/lib libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale metasystems/highlander-0.9.91-patched/Makefile @@ -10,11 +10,11 @@ generated by GNU Autoconf 2.60. Invocation command line was ## Platform. ## ## --------- ## -hostname = Oxygen.local +hostname = dsl092-007-114.sfo1.dsl.speakeasy.net uname -m = i386 -uname -r = 9.6.0 +uname -r = 9.4.0 uname -s = Darwin -uname -v = Darwin Kernel Version 9.6.0: Mon Nov 24 17:37:00 PST 2008; root:xnu-1228.9.59~1/RELEASE_I386 +uname -v = Darwin Kernel Version 9.4.0: Mon Jun 9 19:30:53 PDT 2008; root:xnu-1228.5.20~1/RELEASE_I386 /usr/bin/uname -p = i386 /bin/uname -X = unknown @@ -23,35 +23,31 @@ uname -v = Darwin Kernel Version 9.6.0: Mon Nov 24 17:37:00 PST 2008; root:xnu-1 /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown /usr/bin/hostinfo = Mach kernel version: - Darwin Kernel Version 9.6.0: Mon Nov 24 17:37:00 PST 2008; root:xnu-1228.9.59~1/RELEASE_I386 + Darwin Kernel Version 9.4.0: Mon Jun 9 19:30:53 PDT 2008; root:xnu-1228.5.20~1/RELEASE_I386 Kernel configured for up to 8 processors. 8 processors are physically available. 8 processors are logically available. Processor type: i486 (Intel 80486) Processors active: 0 1 2 3 4 5 6 7 -Primary memory available: 6.00 gigabytes -Default processor set: 85 tasks, 378 threads, 8 processors -Load average: 0.05, Mach factor: 7.94 +Primary memory available: 12.00 gigabytes +Default processor set: 108 tasks, 434 threads, 8 processors +Load average: 4.56, Mach factor: 3.43 /bin/machine = unknown /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /opt/local/bin -PATH: /opt/local/sbin PATH: . PATH: /Users/tim/bin PATH: /usr/local/bin PATH: /usr/local/flex_sdk_3/bin -PATH: /usr/local/android/tools +PATH: /usr/local/android-sdk-mac_x86-0.9_beta PATH: /usr/local/mysql/bin PATH: /usr/local/pgsql/bin -PATH: /opt/local/bin PATH: /usr/bin PATH: /bin PATH: /usr/sbin PATH: /sbin PATH: /usr/local/bin -PATH: /usr/texbin PATH: /usr/X11/bin @@ -64,8 +60,14 @@ configure:1811: result: /usr/bin/install -c configure:1822: checking whether build environment is sane configure:1865: result: yes configure:1930: checking for gawk -configure:1946: found /opt/local/bin/gawk -configure:1957: result: gawk +configure:1960: result: no +configure:1930: checking for mawk +configure:1960: result: no +configure:1930: checking for nawk +configure:1960: result: no +configure:1930: checking for awk +configure:1946: found /usr/bin/awk +configure:1957: result: awk configure:1968: checking whether make sets $(MAKE) configure:1989: result: yes configure:2221: checking for ranlib @@ -76,7 +78,7 @@ configure:2338: found /usr/bin/gcc configure:2349: result: gcc configure:2587: checking for C compiler version configure:2594: gcc --version >&5 -i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5490) +i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5484) Copyright (C) 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -85,9 +87,9 @@ configure:2597: $? = 0 configure:2604: gcc -v >&5 Using built-in specs. Target: i686-apple-darwin9 -Configured with: /var/tmp/gcc/gcc-5490~1/src/configure --disable-checking -enable-werror --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib --build=i686-apple-darwin9 --with-arch=apple --with-tune=generic --host=i686-apple-darwin9 --target=i686-apple-darwin9 +Configured with: /var/tmp/gcc/gcc-5484~1/src/configure --disable-checking -enable-werror --prefix=/usr --mandir=/share/man --enable-languages=c,objc,c++,obj-c++ --program-transform-name=/^[cg][^.-]*$/s/$/-4.0/ --with-gxx-include-dir=/include/c++/4.0.0 --with-slibdir=/usr/lib --build=i686-apple-darwin9 --with-arch=apple --with-tune=generic --host=i686-apple-darwin9 --target=i686-apple-darwin9 Thread model: posix -gcc version 4.0.1 (Apple Inc. build 5490) +gcc version 4.0.1 (Apple Inc. build 5484) configure:2607: $? = 0 configure:2614: gcc -V >&5 gcc-4.0: argument to `-V' is missing @@ -573,7 +575,7 @@ generated by GNU Autoconf 2.60. Invocation command line was CONFIG_COMMANDS = $ ./config.status -on Oxygen.local +on dsl092-007-114.sfo1.dsl.speakeasy.net config.status:604: creating Makefile config.status:789: executing depfiles commands @@ -632,7 +634,7 @@ ac_cv_objext=o ac_cv_path_EGREP='/usr/bin/grep -E' ac_cv_path_GREP=/usr/bin/grep ac_cv_path_install='/usr/bin/install -c' -ac_cv_prog_AWK=gawk +ac_cv_prog_AWK=awk ac_cv_prog_CPP='gcc -E' ac_cv_prog_ac_ct_CC=gcc ac_cv_prog_ac_ct_RANLIB=ranlib @@ -649,15 +651,15 @@ am_cv_CC_dependencies_compiler_type=gcc3 ## Output variables. ## ## ----------------- ## -ACLOCAL='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9' +ACLOCAL='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9' AMDEPBACKSLASH='\' AMDEP_FALSE='#' AMDEP_TRUE='' -AMTAR='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run tar' -AUTOCONF='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf' -AUTOHEADER='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader' -AUTOMAKE='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9' -AWK='gawk' +AMTAR='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run tar' +AUTOCONF='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf' +AUTOHEADER='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader' +AUTOMAKE='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9' +AWK='awk' CC='gcc' CCDEPMODE='depmode=gcc3' CFLAGS='-g -O2' @@ -679,7 +681,7 @@ LDFLAGS='' LIBOBJS=' ${LIBOBJDIR}lstat$U.o' LIBS='' LTLIBOBJS=' ${LIBOBJDIR}lstat$U.lo' -MAKEINFO='${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo' +MAKEINFO='${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo' OBJEXT='o' PACKAGE='highlander' PACKAGE_BUGREPORT='boa@metasystems.no' @@ -712,7 +714,7 @@ host_alias='' htmldir='${docdir}' includedir='${prefix}/include' infodir='${datarootdir}/info' -install_sh='/Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/install-sh' +install_sh='/projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/install-sh' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' metasystems/highlander-0.9.91-patched/config.log @@ -322,7 +322,7 @@ Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched' +ac_pwd='/projects/repositories/highland/metasystems/highlander-0.9.91-patched' srcdir='.' INSTALL='/usr/bin/install -c' # If no file are specified by the user, then we need to provide default @@ -507,19 +507,19 @@ s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g s,@CYGPATH_W@,|#_!!_#|echo,g s,@PACKAGE@,|#_!!_#|highlander,g s,@VERSION@,|#_!!_#|0.9.91,g -s,@ACLOCAL@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9,g -s,@AUTOCONF@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf,g -s,@AUTOMAKE@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9,g -s,@AUTOHEADER@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader,g -s,@MAKEINFO@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo,g -s,@install_sh@,|#_!!_#|/Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/install-sh,g +s,@ACLOCAL@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run aclocal-1.9,g +s,@AUTOCONF@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoconf,g +s,@AUTOMAKE@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run automake-1.9,g +s,@AUTOHEADER@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run autoheader,g +s,@MAKEINFO@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run makeinfo,g +s,@install_sh@,|#_!!_#|/projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/install-sh,g s,@STRIP@,|#_!!_#|,g s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|${SHELL} $(install_sh) -c -s,g s,@mkdir_p@,|#_!!_#|$(install_sh) -d,g -s,@AWK@,|#_!!_#|gawk,g +s,@AWK@,|#_!!_#|awk,g s,@SET_MAKE@,|#_!!_#|,g s,@am__leading_dot@,|#_!!_#|.,g -s,@AMTAR@,|#_!!_#|${SHELL} /Users/tim/Desktop/Repositories/nuhighlander/metasystems/highlander-0.9.91-patched/extras/missing --run tar,g +s,@AMTAR@,|#_!!_#|${SHELL} /projects/repositories/highland/metasystems/highlander-0.9.91-patched/extras/missing --run tar,g s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g s,@am__untar@,|#_!!_#|${AMTAR} xf -,g s,@RANLIB@,|#_!!_#|ranlib,g metasystems/highlander-0.9.91-patched/config.status @@ -21,6 +21,7 @@ static void entity_header_clear_flags(entity_header gh); #define ENTITY_HEADER_CONTENT_TYPE_SET (0x80) #define ENTITY_HEADER_EXPIRES_SET (0x100) #define ENTITY_HEADER_LAST_MODIFIED_SET (0x200) +#define ENTITY_HEADER_CACHE_CONTROL_SET (0x400) struct entity_header_tag { flagtype flags; @@ -35,6 +36,7 @@ struct entity_header_tag { cstring content_type; /* v1.0 §10.5 v1.1 §14.17 */ time_t expires; time_t last_modified; + cstring cache_control; }; entity_header entity_header_new(void) @@ -50,6 +52,7 @@ entity_header entity_header_new(void) p->content_md5 = cstring_new(); p->content_type = cstring_new(); p->content_range = cstring_new(); + p->cache_control = cstring_new(); } return p; @@ -65,6 +68,7 @@ void entity_header_free(entity_header p) cstring_free(p->content_md5); cstring_free(p->content_type); cstring_free(p->content_range); + cstring_free(p->cache_control); free(p); } @@ -148,6 +152,17 @@ int entity_header_set_content_type(entity_header eh, const char* value) return 1; } +int entity_header_set_cache_control(entity_header eh, const char* value) +{ + assert(NULL != eh); + assert(NULL != value); + + if(!cstring_copy(eh->cache_control, value)) + return 0; + + entity_header_set_flag(eh, ENTITY_HEADER_CACHE_CONTROL_SET); + return 1; +} int entity_header_set_content_md5(entity_header eh, const char* value) { @@ -238,6 +253,12 @@ int entity_header_content_type_isset(entity_header eh) return entity_header_flag_is_set(eh, ENTITY_HEADER_CONTENT_TYPE_SET); } +int entity_header_cache_control_isset(entity_header eh) +{ + assert(eh != NULL); + return entity_header_flag_is_set(eh, ENTITY_HEADER_CACHE_CONTROL_SET); +} + int entity_header_expires_isset(entity_header eh) { assert(eh != NULL); @@ -328,6 +349,13 @@ const char* entity_header_get_content_type(entity_header eh) return c_str(eh->content_type); } +const char* entity_header_get_cache_control(entity_header eh) +{ + assert(eh != NULL); + assert(entity_header_flag_is_set(eh, ENTITY_HEADER_CACHE_CONTROL_SET)); + return c_str(eh->cache_control); +} + time_t entity_header_get_expires(entity_header eh) { assert(eh != NULL); @@ -387,6 +415,11 @@ static inline int send_last_modified(entity_header eh, connection conn) return http_send_date(conn, "Last-Modified: ", eh->last_modified); } +static inline int send_cache_control(entity_header eh, connection conn) +{ + return http_send_field(conn, "Cache-control: ", eh->cache_control); // cstring_dup("max-age=600")); +} + static inline int send_content_length(entity_header eh, connection conn) { char buf[100] = {'\0'}; /* "Content-Length: " + length + '\r\n\0' */ @@ -417,6 +450,7 @@ int entity_header_send_fields(entity_header eh, connection c) { ENTITY_HEADER_CONTENT_TYPE_SET, send_content_type }, { ENTITY_HEADER_EXPIRES_SET, send_expires }, { ENTITY_HEADER_LAST_MODIFIED_SET, send_last_modified }, + { ENTITY_HEADER_CACHE_CONTROL_SET, send_cache_control }, }; nelem = sizeof fields / sizeof *fields; metasystems/highlander-0.9.91-patched/src/entity_header.c @@ -163,6 +163,8 @@ static int send_disk_file( return set_http_error(e, HTTP_406_NOT_ACCEPTABLE); } + response_set_cache_control(response, "max-age=3600"); + content_type = get_mime_type(filename); /* This function does not actually send the file, just stats it metasystems/highlander-0.9.91-patched/src/highlander.c @@ -227,6 +227,7 @@ int entity_header_set_content_range(entity_header eh, const char *value); int entity_header_set_content_type(entity_header eh, const char *value); void entity_header_set_expires(entity_header eh, time_t value); void entity_header_set_last_modified(entity_header eh, time_t value); +int entity_header_set_cache_control(entity_header eh, const char *value); int entity_header_content_type_is(entity_header eh, const char* val); @@ -240,6 +241,7 @@ const char* entity_header_get_content_range(entity_header eh); const char* entity_header_get_content_type(entity_header eh); time_t entity_header_get_expires(entity_header eh); time_t entity_header_get_last_modified(entity_header eh); +const char *entity_header_get_cache_control(entity_header eh); int entity_header_allow_isset(entity_header eh); int entity_header_content_encoding_isset(entity_header eh); @@ -251,6 +253,7 @@ int entity_header_content_range_isset(entity_header eh); int entity_header_content_type_isset(entity_header eh); int entity_header_expires_isset(entity_header eh); int entity_header_last_modified_isset(entity_header eh); +int entity_header_cache_control_isset(entity_header eh); int parse_request_headerfield( connection conn, metasystems/highlander-0.9.91-patched/src/internals.h @@ -462,6 +462,12 @@ int response_set_cookie(http_response response, cookie new_cookie) return 1; } +int response_set_cache_control(http_response response, const char* value) +{ + assert(NULL != response); + return entity_header_set_cache_control(response->entity_header, value); +} + int http_send_date(connection conn, const char* name, time_t value) { char date[100]; metasystems/highlander-0.9.91-patched/src/response.c @@ -128,6 +128,10 @@ id RESPONSE; // symbol response_set_content_type(response, [string cStringUsingEncoding:NSUTF8StringEncoding]); } +- (void) setCacheControl:(NSString *) string +{ + response_set_cache_control(response, [string cStringUsingEncoding:NSUTF8StringEncoding]); +} @end objc/server.m cca78ea9edada949f2486920ac915ca5b6fe7bcc Tim Burks tim@neontology.com http://github.com/timburks/highland/commit/abd63321310a861e5020aacf07df4dc2ab43fdeb abd63321310a861e5020aacf07df4dc2ab43fdeb 2009-05-31T16:06:23-07:00 2009-05-31T16:06:23-07:00 Added cache control capabilities to highlander, hard-coded max-age for static pages to 3600s. e251a9defea8e61dba2de6149b2049615992e9db Tim Burks tim@neontology.com