Re: libapreq 2.12 failing with apache 2.2.14
Can you write a patch for our tests that just checks for text/*?
Attached
Is this just a bad test?
Well they're dependent on LWP not being stupid with mime types and changing
them
without any notice. The fails aren't in any indicative of a problem with
apreq's
codebase.
I was in no way impugning the libapreq codebase :)
ta
Clint
diff -ruN libapreq2-2.12/glue/perl/t/apreq/cgi.t libapreq2-2.12_patched/glue/perl/t/apreq/cgi.t
--- libapreq2-2.12/glue/perl/t/apreq/cgi.t 2009-03-06 00:39:05.0 +
+++ libapreq2-2.12_patched/glue/perl/t/apreq/cgi.t 2009-10-08 15:43:50.0 +
@@ -25,7 +25,7 @@
closedir $dh;
if (scalar @files 0) {
my $file = $files[0];
-$types{$file} = ($file =~ /\.pod$/) ? 'text/x-pod' : 'text/plain';
+$types{$file} = 'text/*';
}
}
@@ -195,6 +195,7 @@
filename = $file);
$result =~ s{\r}{}g;
my %h = map {$_;} split /[=;]/, $result, -1;
+$h{type}=~s{^text/.+}{text/*};
ok t_cmp($h{type}, $types{$basename},
'type' test for $method on $basename);
ok t_cmp($h{filename}, $basename,
diff -ruN libapreq2-2.12/glue/perl/t/apreq/upload.t libapreq2-2.12_patched/glue/perl/t/apreq/upload.t
--- libapreq2-2.12/glue/perl/t/apreq/upload.t 2009-03-06 00:39:05.0 +
+++ libapreq2-2.12_patched/glue/perl/t/apreq/upload.t 2009-10-08 15:43:58.0 +
@@ -32,7 +32,7 @@
if (scalar @files 1) {
for my $i (0 .. 1) {
my $file = $files[$i];
-$types{$file} = ($file =~ /\.pod$/) ? 'text/x-pod' : 'text/plain';
+$types{$file} = 'text/*';
}
}
}
@@ -64,6 +64,7 @@
my $result = UPLOAD_BODY($location?method=$method;has_md5=$has_md5,
filename = $file);
my %h = map {$_;} split /[=;]/, $result, -1;
+$h{type}=~s{^text/.+}{text/*};
ok t_cmp($h{type}, $types{$basename},
'type' test for $method on $basename);
ok t_cmp($h{filename}, $basename,
Re: Making a binary distribution package... for AIX
I guess the simple start will be to use example A:
Ex 1: PkgA - single fileset with no requisites
--
Directory Structure:
/tmp/packages
/tmp/packages/usr/doc/PkgA/README
/tmp/packages/usr/PkgA/bin/acommand
Template File:
Package Name: aix.apache
Package VRMF: 2.2.14.0
Update: N
Fileset
Fileset Name: aix.apache2.rte
Fileset VRMF: 2.2.14.0
Fileset Description: Apache runtime fileset
Bosboot required: N
License agreement acceptance required: N
Include license files in this package: N
Requisites:
USRFiles
/usr/doc/PkgA
/usr/doc/PkgA/README
/usr/PkgA
/usr/PkgA/bin
/usr/PkgA/bin/acommand
EOUSRFiles
ROOT Part: N
ROOTFiles
EOROOTFiles
EOFileset
=
So, what do I need to do with the .spec file, if anything, to create a
/tmp/packing area. I was thinking, as an initial test, to jst creating a
symbolic link from /usr/local to /tmp/package and seeing what the contents
are - and package those. Or am I being much too simple minded?
Or, not having looked at it yet - should I be focusing on a replacement for
rpmbuild (assuming it is a script)?
Michael
On Wed, Oct 7, 2009 at 10:33 PM, Michael Felt mamf...@gmail.com wrote:
And then some links into IBM:
http://publib.boulder.ibm.com/infocenter/pseries/v5r3/topic/com.ibm.aix.install/doc/insgdrf/sw_pkg_creation.htm
http://publib.boulder.ibm.com/infocenter/pseries/v5r3/topic/com.ibm.aix.cmds/doc/aixcmds3/mkinstallp.htm
And the example file mentioned is attached (
/usr/lpp/bos/README.MKINSTALLP)
On Wed, Oct 7, 2009 at 10:02 PM, Michael Felt mamf...@gmail.com wrote:
A sample of instructions I would follow are here:
http://pware.hvcc.edu/PwarePackagingGuide.pdf. I just do not intend to
call it pware.* but something different. Naming is so hard!
On Wed, Oct 7, 2009 at 9:56 PM, Michael Felt mamf...@gmail.com wrote:
I'll have to look into the exact format of the files to make it something
the AIX installer can work with - these are extra files.
bff stands for backup file format. rather than being a tarball it is a
file created by backup (backupbyfilename).
a rough approximation of how the file would be created is:
cd ${SOME_ROOTDIR}
find . | backup -if PackageName.bff
## backup -i means read standard inout for the names of files to
backup.
On Wed, Oct 7, 2009 at 9:49 PM, Graham Leggett minf...@sharp.fm wrote:
Michael Felt wrote:
New question: that will mean homework I suspect.
As I mentioned before, I am interested in creating a build that other
people could install. Having one is the only way to see how big a
need,
if any exists, for a prebuilt AIX opensource httpd server.
I suppose I could go for a RPM build - maybe all I need is on AIX by
default, and perhaos it is the first step to learning what needs to be
done.
My preference is to create a .bff (or installp) format.
I have found the build/rpm directory, and what seems to be the actual
file intended: ./httpd.spec
Question is: How do I use this file, and maybe modify it, to create a
specification for an AIX binary distribution?
The basic pattern for rpm is that if a file called tarballname.spec
exists in the tarball, then that spec file is used as a recipe to build
the RPM when you go rpmbuild -tb tarball.tar.bz2.
The recipe contains three things, metadata about the package (name,
version, description, other stuff), scripts used to build the package
and perform pre and post installation, and a list of files in the rpm.
The buildconf script builds the httpd.spec file from httpd.spec.in,
inserting the version number and other details into the file. The result
is that when a tarball is rolled, a file called httpd.spec exists in the
right place containing the right names, MMNs and version numbers.
Do you have an example of how a .bff file is built?
Regards,
Graham
--
[VOTE] release httpd mod_fcgid-2.3.4
Thanks to Jeff's catch, we scuttled 2.3.3. We have yet another candidate for your consideration. Please fetch up the newly minted mod_fcgid-2.3.4.tar.gz (or .tar.bz2) or the win32/netware suitable package mod_fcgid-2.3.3-crlf.zip from: http://httpd.apache.org/dev/dist/mod_fcgid/ review, take it for a spin, and cast your choice [ ] -1 for any release of 2.3.4 (regressed from 2.3.1?) [ ] +1 to release as 2.3.4-beta [ ] +1 to release as 2.3.4-GA For getting started, http://svn.apache.org/repos/asf/httpd/mod_fcgid/tags/2.3.4/README-FCGID
Re: [VOTE] release httpd mod_fcgid-2.3.4
William A. Rowe, Jr. wrote: [X] +1 to release as 2.3.4-beta [X] +1 to release as 2.3.4-GA Unless anyone renames newly-named directives in the next 2 1/2 days, I really don't see a reason to call this beta anymore. We already concur it's above the quality of the often-deployed mod_fcgid that was contributed in the first place, and we now have docs which surpass the random collection of notes spread across the web. Bill
Re: [VOTE] release httpd mod_ftp-0.9.6 beta?
William A. Rowe, Jr. wrote: I'll leave the vote open three more days before ending evaluation of this package There are sufficient votes to release, so in about 14 hours it will be announced unless the tide turns between now and then.
ProxyPreserveHost
Hi, Can anyone see anything wrong with changing the ProxyPreserveHost directive so that it's configurable from directory? ./modules/proxy/mod_proxy.c: AP_INIT_FLAG(ProxyPreserveHost, set_preserve_host, NULL, RSRC_CONF, --- AP_INIT_FLAG(ProxyPreserveHost, set_preserve_host, NULL, RSRC_CONF|ACCESS_CONF, Thanks Ed Neville signature.asc Description: Digital signature
Re: ProxyPreserveHost
On 8 Oct 2009, at 10:06, ed wrote: Hi, Can anyone see anything wrong with changing the ProxyPreserveHost directive so that it's configurable from directory? It would need to be on the per-dir config for that to work correctly. As it stands, if you have enabled that you have a nasty gotcha: set different values in different Location contexts, and they'll just overwrite each other. -- Nick Kew
Re: [VOTE] release httpd mod_fcgid-2.3.4
On Thu, Oct 8, 2009 at 3:33 AM, William A. Rowe, Jr. wr...@rowe-clan.net wrote: Thanks to Jeff's catch, we scuttled 2.3.3. We have yet another candidate for your consideration. Thank you! [X] +1 to release as 2.3.4-beta [X] +1 to release as 2.3.4-GA It builds cleanly and holds up to a variety of requests under load with these platforms and levels of httpd: OpenSolaris 2009.06 x64 with Sun Studio 12: httpd 2.0.x 32-bit httpd 2.2.x 32-bit httpd 2.2.x 64-bit httpd 2.3-dev 32-bit (Event MPM) Ubuntu 8.0.4 x86: httpd 2.0.x httpd 2.2.x httpd 2.3-dev (Event MPM)
Re: [VOTE] release httpd mod_fcgid-2.3.4
On Oct 8, 2009, at 8:30 AM, Jeff Trawick wrote: On Thu, Oct 8, 2009 at 3:33 AM, William A. Rowe, Jr. wr...@rowe-clan.net wrote: Thanks to Jeff's catch, we scuttled 2.3.3. We have yet another candidate for your consideration. Thank you! [X] +1 to release as 2.3.4-beta [X] +1 to release as 2.3.4-GA +1
Re: svn commit: r822870 - in /httpd/httpd/trunk: CHANGES include/util_filter.h
On Oct 7, 2009, at 3:58 PM, Stefan Fritsch wrote: On Wednesday 07 October 2009, Jim Jagielski wrote: Does this really require a CHANGES entry?? No. There is at least one other CHANGES entry about a changed comment, though. CHANGES isn't, and shouldn't be, an external replacement for svn log. Instead, it should be a place where external user-facing changes are documented. If it changes the user-land experience, it belongs in CHANGES. Yes, however, we have not been 100% consistent in this, however :)
Re: [VOTE] release httpd mod_fcgid-2.3.4
William A. Rowe, Jr. wrote: Thanks to Jeff's catch, we scuttled 2.3.3. We have yet another candidate for your consideration. Please fetch up the newly minted mod_fcgid-2.3.4.tar.gz (or .tar.bz2) or the win32/netware suitable package mod_fcgid-2.3.3-crlf.zip from: http://httpd.apache.org/dev/dist/mod_fcgid/ review, take it for a spin, and cast your choice [ ] -1 for any release of 2.3.4 (regressed from 2.3.1?) [ ] +1 to release as 2.3.4-beta [ ] +1 to release as 2.3.4-GA For getting started, http://svn.apache.org/repos/asf/httpd/mod_fcgid/tags/2.3.4/README-FCGID FYI if I had a vote: +1 Authorizer and normal page serving works in our application with 2.3.4. Barry
Re: [VOTE] release httpd mod_fcgid-2.3.4
On Thu, Oct 8, 2009 at 9:56 AM, Barry Scott barry.sc...@onelan.co.uk wrote: William A. Rowe, Jr. wrote: Thanks to Jeff's catch, we scuttled 2.3.3. We have yet another candidate for your consideration. Please fetch up the newly minted mod_fcgid-2.3.4.tar.gz (or .tar.bz2) or the win32/netware suitable package mod_fcgid-2.3.3-crlf.zip from: http://httpd.apache.org/dev/dist/mod_fcgid/ review, take it for a spin, and cast your choice [ ] -1 for any release of 2.3.4 (regressed from 2.3.1?) [ ] +1 to release as 2.3.4-beta [ ] +1 to release as 2.3.4-GA For getting started, http://svn.apache.org/repos/asf/httpd/mod_fcgid/tags/2.3.4/README-FCGID FYI if I had a vote: +1 Authorizer and normal page serving works in our application with 2.3.4. It is great information to have, whether or not it is a formal vote. Thanks!
Re: [VOTE] release httpd mod_fcgid-2.3.4
[x] +1 to release as 2.3.4-beta No time to play enough to vote GA. -- Eric Covener cove...@gmail.com
Re: libapreq 2.12 failing with apache 2.2.14
- Original Message From: Clinton Gormley cl...@traveljury.com To: apreq-dev apreq-...@httpd.apache.org Sent: Wednesday, October 7, 2009 6:19:44 AM Subject: Re: libapreq 2.12 failing with apache 2.2.14 I'm installing apache 2.2.14 with libapreq 2.12, perl 5.8.9 and I'm getting the failures listed below. OK - turns out all of the failures are about the file type: expected: text/x-pod received: text/x-plain Although, I don't understand how the mime type could ever be text/x-pod. The test uses UPLOAD_BODY to upload the file, which in turn relies (via HTTP::Request::Common) on LWP::MediaTypes, which has no definition for text/x-pod. LWP recently changed the LWP/media.types file, pulling the cooked definition for the .pod extension. The reason it's now text/plain (not text/x-plain) is because LWP::MediaTypes guesses the content type using the -T function in perl. Can you write a patch for our tests that just checks for text/*? Is this just a bad test? Well they're dependent on LWP not being stupid with mime types and changing them without any notice. The fails aren't in any indicative of a problem with apreq's codebase.
Re: Making a binary distribution package... for AIX
ok. build/binbuild.sh is the starting point it seems - and I get an error. /bin/sh /data/prj/httpd-2.2.14/srclib/apr/libtool --silent --mode=compile cc -qlanglvl=extc89 -g -qHALT=E -DHAVE_CONFIG_H -U__STR__ -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -I/data/prj/httpd-2.2.14/srclib/apr-util/include -I/data/prj/httpd-2.2.14/srclib/apr-util/include/private -I/data/prj/httpd-2.2.14/srclib/apr/include -I/data/prj/httpd-2.2.14/srclib/apr-util/xml/expat/include -o xml/apr_xml.lo -c xml/apr_xml.c touch xml/apr_xml.lo xml/apr_xml.c, line 35.10: 1506-296 (S) #include file expat.h not found. xml/apr_xml.c, line 66.5: 1506-046 (S) Syntax error. xml/apr_xml.c, line 67.10: 1506-007 (S) enum XML_Error is undefined. xml/apr_xml.c, line 344.28: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 345.13: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 364.60: 1506-277 (S) Syntax error: possible missing ')' or ','? xml/apr_xml.c, line 381.13: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 382.17: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 390.29: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 391.35: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 392.41: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 404.35: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 414.17: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 418.36: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 422.55: 1506-022 (S) xp is not a member of struct apr_xml_parser. make[3]: *** [xml/apr_xml.lo] Error 1 make[3]: Leaving directory `/data/prj/httpd-2.2.14/srclib/apr-util' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/data/prj/httpd-2.2.14/srclib/apr-util' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/data/prj/httpd-2.2.14/srclib' make: *** [all-recursive] Error 1 ERROR: Failed to build Apache. See build.log for details. mich...@x054:[/data/prj/httpd-2.2.14]find . -name expat.h ./srclib/apr-util/xml/expat.h mich...@x054:[/data/prj/httpd-2.2.14]find . -name apr_xml.c ./srclib/apr-util/xml/apr_xml.c mich...@x054:[/data/prj/httpd-2.2.14]find / -fstype jfs2 -name expat.h /data/prj/httpd-2.2.14/srclib/apr-util/xml/expat/lib/expat.h /data/prj/Python-2.6.3/Modules/expat/expat.h /usr/local/apache2/include/expat.h Or, not having looked at it yet - should I be focusing on a replacement for rpmbuild (assuming it is a script)? Michael
Fwd: Cannot compile mod_disk_cache.c (rev. 821993)
Hi! I'm trying to compile mod_cache which was checked out from http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/cache about an hour ago:[r...@dev38 mod_cache]# svn infoPath: .URL: http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/cacheRepository Root: http://svn.apache.org/repos/asfRepository UUID: 13f79535-47bb-0310-9956-ffa450edef68Revision: 823208Node Kind: directorySchedule: normalLast Changed Author: minfrinLast Changed Rev: 821993Last Changed Date: 2009-10-05 16:27:19 -0400 (Mon, 05 Oct 2009)I was able to compile mod_cache.c, but got stuck with mod_disk_cache (mod_cache doesn't seem to be working with the old mod_disk_cache I had). Command I've used: [r...@dev38 mod_cache]#/usr/sbin/apxs -c mod_disk_cache.c /usr/lib64/apr-1/build/libtool --silent --mode=compile gcc -prefer-pic -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack- protector --param=ssp-buffer-size=4 -m64 -mtune=generic -DLINUX=2 - D_REENTRANT -D_GNU_SOURCE -pthread -I/usr/include/httpd -I/usr/ include/apr-1 -I/usr/include/apr-1 -c -o mod_disk_cache.lo mod_disk_cache.c touch mod_disk_cache.slo mod_disk_cache.c: In function 'open_entity': mod_disk_cache.c:380: error: 'core_dir_config' undeclared (first use in this function) mod_disk_cache.c:380: error: (Each undeclared identifier is reported only once mod_disk_cache.c:380: error: for each function it appears in.) mod_disk_cache.c:380: error: 'coreconf' undeclared (first use in this function) mod_disk_cache.c:380: error: 'core_module' undeclared (first use in this function) mod_disk_cache.c:482: error: 'ENABLE_SENDFILE_OFF' undeclared (first use in this function) apxs:Error: Command failed with rc=65536 [r...@dev38 mod_cache]# /usr/sbin/apachectl -v Server version: Apache/2.2.3 Server built: Aug 6 2007 07:22:24 [r...@dev38 mod_cache]# /usr/sbin/apachectl -V Server version: Apache/2.2.3 Server built: Aug 6 2007 07:22:24 Server's Module Magic Number: 20051115:3 Server loaded: APR 1.2.7, APR-Util 1.2.7 Compiled using: APR 1.2.7, APR-Util 1.2.7 Architecture: 64-bit Server MPM: Prefork threaded: no forked: yes (variable process count) Server compiled with -D APACHE_MPM_DIR="server/mpm/prefork" -D APR_HAS_SENDFILE -D APR_HAS_MMAP -D APR_HAVE_IPV6 (IPv4-mapped addresses enabled) -D APR_USE_SYSVSEM_SERIALIZE -D APR_USE_PTHREAD_SERIALIZE -D SINGLE_LISTEN_UNSERIALIZED_ACCEPT -D APR_HAS_OTHER_CHILD -D AP_HAVE_RELIABLE_PIPED_LOGS -D DYNAMIC_MODULE_LIMIT=128 -D HTTPD_ROOT="/etc/httpd" -D SUEXEC_BIN="/usr/sbin/suexec" -D DEFAULT_PIDLOG="logs/httpd.pid" -D DEFAULT_SCOREBOARD="logs/apache_runtime_status" -D DEFAULT_LOCKFILE="logs/accept.lock" -D DEFAULT_ERRORLOG="logs/error_log" -D AP_TYPES_CONFIG_FILE="conf/mime.types" -D SERVER_CONFIG_FILE="conf/httpd.conf" Would be grateful for any help or advise. Thank you. -- Best Regards,Alexander Alfimov
Re: Cannot compile mod_disk_cache.c (rev. 821993)
On Thu, Oct 8, 2009 at 1:44 PM, Alexander Alfimov a.alfi...@gmail.com wrote: Hi! I'm trying to compile mod_cache which was checked out from http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/cache about an hour ago: [r...@dev38 mod_cache]# svn info Path: . URL: http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/cache Repository Root: http://svn.apache.org/repos/asf Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68 Revision: 823208 Node Kind: directory Schedule: normal Last Changed Author: minfrin Last Changed Rev: 821993 Last Changed Date: 2009-10-05 16:27:19 -0400 (Mon, 05 Oct 2009) I was able to compile mod_cache.c, but got stuck with mod_disk_cache (mod_cache doesn't seem to be working with the old mod_disk_cache I had). Command I've used: [r...@dev38 mod_cache]#/usr/sbin/apxs -c mod_disk_cache.c /usr/lib64/apr-1/build/libtool --silent --mode=compile gcc -prefer-pic -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack- protector --param=ssp-buffer-size=4 -m64 -mtune=generic -DLINUX=2 - D_REENTRANT -D_GNU_SOURCE -pthread -I/usr/include/httpd -I/usr/ include/apr-1 -I/usr/include/apr-1 -c -o mod_disk_cache.lo mod_disk_cache.c touch mod_disk_cache.slo mod_disk_cache.c: In function 'open_entity': mod_disk_cache.c:380: error: 'core_dir_config' undeclared (first use in this function) Try adding #define CORE_PRIVATE inside mod_disk_cache.c prior to the inclusion of header files. What you've encountered is an API difference between httpd 2.2 and 2.3-dev. There may be others that show up at compile, link, or run-time. (Maybe somebody here has actually used recent mod*cache from trunk with 2.2 and can comment.) I guess you're anxious to try a fix that is in svn trunk but not in the 2.2.x branch? I wonder if backporting the individual fix is less troublesome...
Re: Cannot compile mod_disk_cache.c (rev. 821993)
Jeff Trawick traw...@gmail.com писал(а) в своём письме Thu, 08 Oct 2009 21:15:51 +0300: Try adding #define CORE_PRIVATE inside mod_disk_cache.c prior to the inclusion of header files. What you've encountered is an API difference between httpd 2.2 and 2.3-dev. There may be others that show up at compile, link, or run-time. (Maybe somebody here has actually used recent mod*cache from trunk with 2.2 and can comment.) I guess you're anxious to try a fix that is in svn trunk but not in the 2.2.x branch? I wonder if backporting the individual fix is less troublesome... Jeff, Thank you very much for the quick response. Adding a CORE_PRIVATE did a trick -- I was able to compile mod_disk_cache.c Unfortunately, this didn't help to solve the root problem. I want to try the CacheQuickHandler Off directive which became available in Apache 2.3 Here is my mod_cache configuration: CacheDefaultExpire 120 CacheMaxExpire 120 CacheIgnoreNoLastMod On CacheIgnoreHeaders On CacheIgnoreCacheControl On CacheStoreNoStore On CacheStorePrivate On CacheQuickHandler Off IfModule mod_disk_cache.c CacheRoot /tmp/apache-cache-l2 CacheEnable disk / CacheDirLevels 8 CacheDirLength 2 /IfModule As soon as I disable the CacheQuickHandler, caching stops working (no new directories appear in the cache directory). Thank you. -- Best Regards, Alexander Alfimov
Cacheability and s-maxage
I believe a couple of changes are needed in mod_cache to correctly consider s-maxage in responses. I'd like to get the list's opinion about it. First, currently if a GET or HEAD request with a query in the URI has a response with Cache-control: s-maxage=NN, that response is not cached. From RFC 2616 13.9, 2nd paragraph, s-maxage specifies an explicit expiration and so the response should be cached despite the query in the URI. Second, currently a successful response with no Last-Modified, Etag, or Expires headers is not cached. If it has Cache-control: max-age or Cache-control: s-maxage, that specifies an expiration, and per RFC 2616 13.4 we would expect it to be cached. I'm attaching a trunk patch that would implement these changes. -- Dan Poirier poir...@pobox.com svn status for directory ~/apache/httpd/httpd/trunk/modules/cache/ 0 file(s) marked 821762 821552 minfrin . 821762 106103 nd .indent.pro 821762 106103 nd Makefile.in 821762 521264 fuankg NWGNUdsk_cach 821762 711470 wrowe NWGNUmakefile 821762 521264 fuankg NWGNUmod_cach 821762 646182 fuankg NWGNUsocachdbm 821762 646177 fuankg NWGNUsocachshmcb 821762 664145 wrowe cache_cache.c 821762 664145 wrowe cache_cache.h 821762 664145 wrowe cache_hash.c 821762 664145 wrowe cache_hash.h 821762 420983 fieldingcache_pqueue.c 821762 420983 fieldingcache_pqueue.h 821762 808212 minfrin cache_storage.c 821762 821539 minfrin cache_util.c 821762 711576 rpluem config.m4 ? ? mod_cache.c.orig M 821763 821763 poirier mod_cache.c 821762 664145 wrowe mod_cache.dsp 821762 821202 minfrin mod_cache.h 821762 659643 bnicholes mod_cache.imp 821763 821763 poirier mod_disk_cache.c 821762 495126 wrowe mod_disk_cache.dsp 821762 502365 minfrin mod_disk_cache.h 821762 743837 fieldingmod_file_cache.c 821762 495126 wrowe mod_file_cache.dsp 821762 106103 nd mod_file_cache.exp 821762 757396 jorton mod_socache_dbm.c 821762 664240 wrowe mod_socache_dbm.dsp 821762 726059 jorton mod_socache_dc.c 821762 664240 wrowe mod_socache_dc.dsp 821762 757396 jorton mod_socache_memcache.c 821762 664240 wrowe mod_socache_memcache.dsp 821762 757396 jorton mod_socache_shmcb.c 821762 664240 wrowe mod_socache_shmcb.dsp
Re: Cacheability and s-maxage
And here's the right patch file, sorry.
--
Dan Poirier poir...@pobox.com
Index: mod_cache.c
===
--- mod_cache.c (revision 821763)
+++ mod_cache.c (working copy)
@@ -767,7 +767,8 @@
reason = Expires header already expired, not cacheable;
}
else if (!conf-ignorequerystring r-parsed_uri.query exps == NULL
- !ap_cache_liststr(NULL, cc_out, max-age, NULL)) {
+ !ap_cache_liststr(NULL, cc_out, max-age, NULL)
+ !ap_cache_liststr(NULL, cc_out, s-maxage, NULL)) {
/* if a query string is present but no explicit expiration time,
* don't cache it (RFC 2616/13.9 13.2.1)
*/
@@ -781,14 +782,16 @@
reason = HTTP Status 304 Not Modified;
}
else if (r-status == HTTP_OK lastmods == NULL etag == NULL
- (exps == NULL) (conf-no_last_mod_ignore ==0)) {
+ (exps == NULL) (conf-no_last_mod_ignore ==0)
+ !ap_cache_liststr(NULL, cc_out, max-age, NULL)
+ !ap_cache_liststr(NULL, cc_out, s-maxage, NULL)) {
/* 200 OK response from HTTP/1.0 and up without Last-Modified,
* Etag, or Expires headers.
*/
/* Note: mod-include clears last_modified/expires/etags - this
* is why we have an optional function for a key-gen ;-)
*/
-reason = No Last-Modified, Etag, or Expires headers;
+reason = No Last-Modified, Etag, Expires, Cache-Control:max-age or
Cache-Control:s-maxage headers;
}
else if (r-header_only !cache-stale_handle) {
/* Forbid HEAD requests unless we have it cached already */
simple
Ugg. not working now. need to trace this.
Re: Cacheability and s-maxage
On 10/08/2009 08:59 PM, Dan Poirier wrote: I believe a couple of changes are needed in mod_cache to correctly consider s-maxage in responses. I'd like to get the list's opinion about it. First, currently if a GET or HEAD request with a query in the URI has a response with Cache-control: s-maxage=NN, that response is not cached. From RFC 2616 13.9, 2nd paragraph, s-maxage specifies an explicit expiration and so the response should be cached despite the query in the URI. Second, currently a successful response with no Last-Modified, Etag, or Expires headers is not cached. If it has Cache-control: max-age or Cache-control: s-maxage, that specifies an expiration, and per RFC 2616 13.4 we would expect it to be cached. I'm attaching a trunk patch that would implement these changes. Sound reasonable and looks fine (I mean the patch in the second mail of course :-)) Regards Rüdiger
Re: [VOTE] release httpd mod_fcgid-2.3.4
William A. Rowe, Jr. wrote: [X] +1 to release as 2.3.4-beta Chris. -- GPG Key ID: 366A375B GPG Key Fingerprint: 485E 5041 17E1 E2BB C263 E4DE C8E3 FA36 366A 375B
Re: svn commit: r823337 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h include/http_core.h modules/loggers/mod_logio.c server/scoreboard.c
On Thursday 08 October 2009, s...@apache.org wrote: --- httpd/httpd/trunk/include/ap_mmn.h (original) +++ httpd/httpd/trunk/include/ap_mmn.h Thu Oct 8 21:42:13 2009 @@ -198,15 +198,17 @@ * 20090401.3 (2.3.3-dev) Added DAV options provider to mod_dav.h * 20090925.0 (2.3.3-dev) Added server_rec::context and added *server_rec * param to ap_wait_or_timeout() + * 20090925.1 (2.3.3-dev) Add optional function ap_logio_get_last_bytes() to + * mod_logio * */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* AP24 */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20090401 +#define MODULE_MAGIC_NUMBER_MAJOR 20090925 #endif -#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ I updated MODULE_MAGIC_NUMBER_MAJOR to match the comments. I hope this is correct?
Re: svn commit: r823337 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h include/http_core.h modules/loggers/mod_logio.c server/scoreboard.c
Stefan Fritsch wrote: On Thursday 08 October 2009, s...@apache.org wrote: --- httpd/httpd/trunk/include/ap_mmn.h (original) +++ httpd/httpd/trunk/include/ap_mmn.h Thu Oct 8 21:42:13 2009 @@ -198,15 +198,17 @@ * 20090401.3 (2.3.3-dev) Added DAV options provider to mod_dav.h * 20090925.0 (2.3.3-dev) Added server_rec::context and added *server_rec * param to ap_wait_or_timeout() + * 20090925.1 (2.3.3-dev) Add optional function ap_logio_get_last_bytes() to + * mod_logio * */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* AP24 */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20090401 +#define MODULE_MAGIC_NUMBER_MAJOR 20090925 #endif -#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ I updated MODULE_MAGIC_NUMBER_MAJOR to match the comments. I hope this is correct? Nope - adding a function doesn't cost us MMN MAJOR (and never delete MMN_MINOR, it just falls back to zero). MMN MAJOR jumps every time we encounter a change to an exported API which users might be calling, which would result in erroneous calls to the function from a module at an older build. It similarly changes when the fields of an existing public data structure change (but not when they are extended).
Re: svn commit: r823337 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h include/http_core.h modules/loggers/mod_logio.c server/scoreboard.c
On Friday 09 October 2009, William A. Rowe, Jr. wrote: * 20090925.0 (2.3.3-dev) Added server_rec::context and added *server_rec * param to ap_wait_or_timeout() + * 20090925.1 (2.3.3-dev) Add optional function ap_logio_get_last_bytes() to + * mod_logio * */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* AP24 */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20090401 +#define MODULE_MAGIC_NUMBER_MAJOR 20090925 #endif -#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ I updated MODULE_MAGIC_NUMBER_MAJOR to match the comments. I hope this is correct? Nope - adding a function doesn't cost us MMN MAJOR (and never delete MMN_MINOR, it just falls back to zero). Sorry, that's not what I meant (and kmail sucks at quoting preformatted mails). The comments indicated MMN 20090925.0 but the code was at 20090401.2. Therefore I assumed this was just forgotten and jumped to 20090925.1. MMN MAJOR jumps every time we encounter a change to an exported API which users might be calling, which would result in erroneous calls to the function from a module at an older build. It similarly changes when the fields of an existing public data structure change (but not when they are extended).
Re: Making a binary distribution package... for AIX
In case the question is not obvious - why is the code not finding it's own expat.h file? Is it not suppossed to - meaning install the expat package? On Thu, Oct 8, 2009 at 6:11 PM, Michael Felt mamf...@gmail.com wrote: ok. build/binbuild.sh is the starting point it seems - and I get an error. /bin/sh /data/prj/httpd-2.2.14/srclib/apr/libtool --silent --mode=compile cc -qlanglvl=extc89 -g -qHALT=E -DHAVE_CONFIG_H -U__STR__ -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -I/data/prj/httpd-2.2.14/srclib/apr-util/include -I/data/prj/httpd-2.2.14/srclib/apr-util/include/private -I/data/prj/httpd-2.2.14/srclib/apr/include -I/data/prj/httpd-2.2.14/srclib/apr-util/xml/expat/include -o xml/apr_xml.lo -c xml/apr_xml.c touch xml/apr_xml.lo xml/apr_xml.c, line 35.10: 1506-296 (S) #include file expat.h not found. xml/apr_xml.c, line 66.5: 1506-046 (S) Syntax error. xml/apr_xml.c, line 67.10: 1506-007 (S) enum XML_Error is undefined. xml/apr_xml.c, line 344.28: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 345.13: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 364.60: 1506-277 (S) Syntax error: possible missing ')' or ','? xml/apr_xml.c, line 381.13: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 382.17: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 390.29: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 391.35: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 392.41: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 404.35: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 414.17: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 418.36: 1506-022 (S) xp is not a member of struct apr_xml_parser. xml/apr_xml.c, line 422.55: 1506-022 (S) xp is not a member of struct apr_xml_parser. make[3]: *** [xml/apr_xml.lo] Error 1 make[3]: Leaving directory `/data/prj/httpd-2.2.14/srclib/apr-util' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/data/prj/httpd-2.2.14/srclib/apr-util' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/data/prj/httpd-2.2.14/srclib' make: *** [all-recursive] Error 1 ERROR: Failed to build Apache. See build.log for details. mich...@x054:[/data/prj/httpd-2.2.14]find . -name expat.h ./srclib/apr-util/xml/expat.h mich...@x054:[/data/prj/httpd-2.2.14]find . -name apr_xml.c ./srclib/apr-util/xml/apr_xml.c mich...@x054:[/data/prj/httpd-2.2.14]find / -fstype jfs2 -name expat.h /data/prj/httpd-2.2.14/srclib/apr-util/xml/expat/lib/expat.h /data/prj/Python-2.6.3/Modules/expat/expat.h /usr/local/apache2/include/expat.h Or, not having looked at it yet - should I be focusing on a replacement for rpmbuild (assuming it is a script)? Michael
Re: Making a binary distribution package... for AIX
Michael Felt wrote: Or, not having looked at it yet - should I be focusing on a replacement for rpmbuild (assuming it is a script)? rpmbuild is a full-on application, which has some pretty involved features for building a package. What this means is that armed with just a spec file, you can build an RPM (or an SRPM, which is the source code, spec file and patches rolled together into a bundle for easy rebuild). A lot of the packaging systems for other platforms are a lot more basic. They assume you've done the legwork doing the actual build, the packaging system kicks in at the last step and turns your tree-of-binaries into a package, not much more sophisticated than humble tar. I think as an example, you should rather be looking at the scripts that do the Solaris packaging. In the Solaris case, the build/pkg/buildpkg.sh script does the actual build (you'll recognise the ./configure;make;make install in there), and once the binaries are built and staged in a temp directory, the various package making commands unique to Solaris are kicked off (pkgproto, pkgtrans) that combine the binaries and the pkginfo template into the package itself. The key most interesting bits from your perspective are probably: - You want to stage the binaries at some temp location, like /var/tmp/foo.12345/, which in turn becomes the root of the install. You achieve this by adding the DESTDIR variable to make install. This causes the whole install procedure to pretend you're installing in /usr (for example), but instead it places the binaries into /var/tmp/foo.12345/usr/. When you package the files, httpd's paths are all set up correctly for the final system, you won't find /var/tmp/foo.12345 lurking in any files. - You'll probably need a template file of some kind. In the rpm case the template file is the spec file. In the Solaris case, the template file is called pkginfo, and this file is populated by filling in the template called pkginfo.in. Unlike the RPM spec file, which must be correctly built and populated before httpd is tarred up and released as a tarball for rpmbuild to work properly (and which is why the spec template is filled in by the buildconf script), the pkginfo.in file is processed at build time by autoconf as an ordinary part of the httpd ./configure;make;make install process. Once ./configure;make;make install is done, the pkginfo file has been processed and is ready to be used by the Solaris packaging commands. I would imagine your packaging would probably follow a similar pattern. Regards, Graham -- smime.p7s Description: S/MIME Cryptographic Signature
