Changeset 1590


Ignore:
Timestamp:
Jul 18, 2010, 7:02:40 PM (12 years ago)
Author:
andersk
Message:
Package new static-cat written in Haskell.

This adds support for Content-Encoding, If-Modified-Since, Range,
If-Range, and REQUEST_METHOD.
Location:
trunk/server
Files:
8 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/common/patches/httpd-suexec-scripts.patch

    r1474 r1590  
    5151  */
    5252 
    53 +#define STATIC_CAT_PATH "/usr/local/bin/static-cat"
     53+#define STATIC_CAT_PATH "/usr/bin/static-cat"
    5454+#define PHP_PATH "/usr/bin/php-cgi"
    5555+
     
    275275         exit(121);
    276276     }
    277 @@ -614,6 +730,20 @@
     277@@ -614,6 +730,23 @@
    278278     /*
    279279      * Execute the command, replacing our image with its own.
    280280      */
    281281+    if (is_static_extension(cmd)) {
    282 +        argv[2] = STATIC_CAT_PATH;
    283 +        execv(STATIC_CAT_PATH, &argv[2]);
    284 +        log_err("(%d)%s: static_cat exec failed (%s)\n", errno, strerror(errno), argv[2]);
     282+        if (setenv("PATH_TRANSLATED", cmd, 1) != 0) {
     283+            log_err("setenv failed\n");
     284+            exit(255);
     285+        }
     286+        execl(STATIC_CAT_PATH, STATIC_CAT_PATH, (const char *)NULL);
     287+        log_err("(%d)%s: static-cat exec failed (%s)\n", errno, strerror(errno), STATIC_CAT_PATH);
    285288+        exit(255);
    286289+    }
  • trunk/server/fedora/Makefile

    r1587 r1590  
    2020
    2121upstream_yum    = krb5 krb5.i586 httpd openssh shadow-utils libpng ghostscript
    22 upstream        = openafs $(upstream_yum) moira cluster-glue heartbeat pacemaker
    23 oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-wizard scripts-base
     22hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
     23upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
     24upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker
     25oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-wizard scripts-base scripts-static-cat
    2426allsrc          = $(upstream) $(oursrc)
    2527oursrcdir       = ${PWD}/../common/oursrc
     
    7375        wget -P $(dload) $(pacemaker_url)
    7476        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
     77        cabal update
     78        cabal fetch $(hackage)
     79        cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
    7580        touch download_stamp
    7681
     
    203208openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
    204209php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
     210haskell-deps    = cabal-install
    205211install-deps:
    206         yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps) $(php-deps)
     212        yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
    207213        rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
    208214#       rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
Note: See TracChangeset for help on using the changeset viewer.