OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 01-Feb-2009 20:17:28 Branch: HEAD Handle: 2009020119172700 Modified files: openpkg-src/apache apache.patch apache.spec Log: fix autoindex table output and improve output by adding CSS classes Summary: Revision Changes Path 1.40 +36 -10 openpkg-src/apache/apache.patch 1.447 +1 -1 openpkg-src/apache/apache.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.patch ============================================================================ $ cvs diff -u -r1.39 -r1.40 apache.patch --- openpkg-src/apache/apache.patch 14 Dec 2008 10:07:08 -0000 1.39 +++ openpkg-src/apache/apache.patch 1 Feb 2009 19:17:27 -0000 1.40 @@ -1,6 +1,6 @@ Index: build/config_vars.sh.in --- build/config_vars.sh.in.orig 2008-02-05 00:00:07 +0100 -+++ build/config_vars.sh.in 2008-12-14 11:00:41 +0100 ++++ build/config_vars.sh.in 2009-02-01 17:53:32 +0100 @@ -35,7 +35,7 @@ apu_conf...@apu_config@ fi @@ -12,7 +12,7 @@ Index: config.layout --- config.layout.orig 2004-11-21 19:50:36 +0100 -+++ config.layout 2008-12-14 11:00:41 +0100 ++++ config.layout 2009-02-01 17:53:32 +0100 @@ -50,7 +50,7 @@ iconsdir: ${datadir}/icons htdocsdir: ${datadir}/htdocs @@ -24,7 +24,7 @@ runtimedir: ${localstatedir}/run Index: configure --- configure.orig 2008-12-06 16:17:59 +0100 -+++ configure 2008-12-14 11:00:41 +0100 ++++ configure 2009-02-01 17:53:32 +0100 @@ -3597,6 +3597,11 @@ { (exit 1); exit 1; }; } fi @@ -51,7 +51,7 @@ reconfig.yes) Index: docs/conf/mime.types --- docs/conf/mime.types.orig 2008-12-01 06:54:25 +0100 -+++ docs/conf/mime.types 2008-12-14 11:01:41 +0100 ++++ docs/conf/mime.types 2009-02-01 17:53:32 +0100 @@ -83,6 +83,7 @@ application/mbox mbox application/media_control+xml @@ -119,7 +119,7 @@ application/xcap-caps+xml Index: docs/docroot/index.html --- docs/docroot/index.html.orig 2004-11-20 21:16:24 +0100 -+++ docs/docroot/index.html 2008-12-14 11:00:41 +0100 ++++ docs/docroot/index.html 2009-02-01 17:53:32 +0100 @@ -1 +1,7 @@ -<html><body><h1>It works!</h1></body></html> \ No newline at end of file @@ -132,7 +132,7 @@ +</html> Index: modules/generators/mod_autoindex.c --- modules/generators/mod_autoindex.c.orig 2008-11-29 22:47:13 +0100 -+++ modules/generators/mod_autoindex.c 2008-12-14 11:00:41 +0100 ++++ modules/generators/mod_autoindex.c 2009-02-01 18:06:21 +0100 @@ -1573,17 +1573,17 @@ ++cols; @@ -154,9 +154,35 @@ emit_link(r, "Size", K_SIZE, keyid, direction, colargs, static_columns); ++cols; +@@ -1677,7 +1677,14 @@ + } + + if (autoindex_opts & TABLE_INDEXING) { +- ap_rputs("<tr>", r); ++ char *class; ++ if (strcmp(t2, "Parent Directory") == 0) ++ class = "updir"; ++ else if (ar[x]->isdir) ++ class = "dir"; ++ else ++ class = "file"; ++ ap_rvputs(r, "<tr class=\"", class, "\">", NULL); + if (!(autoindex_opts & SUPPRESS_ICON)) { + ap_rputs("<td valign=\"top\">", r); + if (autoindex_opts & ICONS_ARE_LINKS) { +@@ -1763,9 +1770,6 @@ + } + } + } +- else { +- ap_rputs("</td><td> ", r); +- } + ap_rputs("</td></tr>\n", r); + } + else if (autoindex_opts & FANCY_INDEXING) { Index: server/Makefile.in --- server/Makefile.in.orig 2006-03-09 22:29:55 +0100 -+++ server/Makefile.in 2008-12-14 11:00:41 +0100 ++++ server/Makefile.in 2009-02-01 17:53:32 +0100 @@ -56,7 +56,8 @@ tmp=export_files_unsorted.txt; \ rm -f $$tmp && touch $$tmp; \ @@ -169,7 +195,7 @@ (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \ Index: support/Makefile.in --- support/Makefile.in.orig 2005-07-07 01:15:34 +0200 -+++ support/Makefile.in 2008-12-14 11:00:41 +0100 ++++ support/Makefile.in 2009-02-01 17:53:32 +0100 @@ -22,12 +22,6 @@ chmod 755 $(DESTDIR)$(sbindir)/$$i; \ fi ; \ @@ -185,7 +211,7 @@ htpasswd: $(htpasswd_OBJECTS) Index: support/apachectl.in --- support/apachectl.in.orig 2006-07-12 05:38:44 +0200 -+++ support/apachectl.in 2008-12-14 11:00:41 +0100 ++++ support/apachectl.in 2009-02-01 17:53:32 +0100 @@ -43,11 +43,6 @@ # the path to your httpd binary, including options if necessary HTTPD='@exp_sbindir@/@progname@' @@ -200,7 +226,7 @@ # programs may work. Index: support/apxs.in --- support/apxs.in.orig 2006-07-12 05:38:44 +0200 -+++ support/apxs.in 2008-12-14 11:00:41 +0100 ++++ support/apxs.in 2009-02-01 17:53:32 +0100 @@ -190,9 +190,6 @@ my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); $httpd = eval qq("$httpd"); @@ . patch -p0 <<'@@ .' Index: openpkg-src/apache/apache.spec ============================================================================ $ cvs diff -u -r1.446 -r1.447 apache.spec --- openpkg-src/apache/apache.spec 25 Jan 2009 18:11:18 -0000 1.446 +++ openpkg-src/apache/apache.spec 1 Feb 2009 19:17:27 -0000 1.447 @@ -32,7 +32,7 @@ Group: Web License: ASF Version: 2.2.11 -Release: 20090125 +Release: 20090201 # package options %option with_mpm_prefork yes @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
