Author: bojan
Date: Wed Jun 10 22:07:54 2009
New Revision: 783546
URL: http://svn.apache.org/viewvc?rev=783546&view=rev
Log:
Prepare for --avoid-dbm option to apu-1-config.
Modified:
httpd/apreq/trunk/acinclude.m4
Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?rev=783546&r1=783545&r2=783546&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Wed Jun 10 22:07:54 2009
@@ -173,25 +173,25 @@
dnl perl glue/tests do not use libtool: need ld linker flags
APR_ADDTO([APR_LIBS], "`$APR_CONFIG --libs`")
+ apu_avoid_libs=""
+ if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
+ apu_avoid_libs="--avoid-ldap"
+ fi
+ if $APU_CONFIG --avoid-dbm >/dev/null 2>&1; then
+ apu_avoid_libs="--avoid-dbm $apu_avoid_libs"
+ fi
+
dnl ld: fatal: recording name conflict:
dnl file `/usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/../../../libexpat.so' and
dnl file `httpd/lib/libexpat.so'
dnl provide identical dependency names: libexpat.so.0
dnl (possible multiple inclusion of the same file)
if test "x$OS" = "xsolaris"; then
- if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
- APU_LIBS=`$APU_CONFIG --avoid-ldap --libs | $PERL -pe 's,-lexpat,,'`
- else
- APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'`
- fi
- APR_ADDTO([APR_LIBS], "$APU_LIBS")
+ APU_LIBS="`$APU_CONFIG $apu_avoid_libs --libs | $PERL -pe 's,-lexpat,,'`"
else
- if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
- APR_ADDTO([APR_LIBS], "`$APU_CONFIG --avoid-ldap --libs`")
- else
- APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
- fi
+ APU_LIBS="`$APU_CONFIG $apu_avoid_libs --libs`"
fi
+ APR_ADDTO([APR_LIBS], "$APU_LIBS")
APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
APR_ADDTO([APR_LDFLAGS], "`$APR_CONFIG --link-ld --ldflags`")
Author: pgollucci
Date: Tue May 19 06:11:42 2009
New Revision: 776197
URL: http://svn.apache.org/viewvc?rev=776197&view=rev
Log:
2.12 was released, this is ancient history
Removed:
httpd/apreq/branches/v2_11/
Author: joes
Date: Fri Mar 13 23:07:43 2009
New Revision: 753468
URL: http://svn.apache.org/viewvc?rev=753468&view=rev
Log:
libapreq2-2.12 released
Added:
httpd/apreq/tags/v2_12/
- copied from r753466, httpd/apreq/branches/v2_12/
Removed:
httpd/apreq/branches/v2_12/
Author: joes
Date: Tue Mar 10 00:18:20 2009
New Revision: 751918
URL: http://svn.apache.org/viewvc?rev=751918&view=rev
Log:
Onwards and upwards.
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/STATUS
httpd/apreq/trunk/configure.ac
httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm
httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm
httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod
Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Tue Mar 10 00:18:20 2009
@@ -1,7 +1,9 @@
/** @page apreq_changes CHANGES
//! brief List of major changes.
-@section v2_12 Changes with libapreq2-2.12 (in development)
+@section v2_13 Changes with libapreq2-2.13 (in development)
+
+@section v2_12 Changes with libapreq2-2.12 (released March 13, 2009)
- C API [joes]
Make the cookie parser a little more flexible.
Modified: httpd/apreq/trunk/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/STATUS?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/STATUS (original)
+++ httpd/apreq/trunk/STATUS Tue Mar 10 00:18:20 2009
@@ -1,6 +1,6 @@
/** @page apreq_status STATUS
- 2.12 under developement
+ 2.13 under developement
Contributors looking for a mission:
Modified: httpd/apreq/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/configure.ac?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/configure.ac (original)
+++ httpd/apreq/trunk/configure.ac Tue Mar 10 00:18:20 2009
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(Apache HTTP Server Request Library, 2.12, apreq-dev@httpd.apache.org, libapreq2)
+AC_INIT(Apache HTTP Server Request Library, 2.13, apreq-dev@httpd.apache.org, libapreq2)
dnl Generate config.nice script- macro must be here at the top
dnl to avoid corruption of $0 and $@.
APR_CONFIG_NICE(config.nice)
@@ -13,7 +13,7 @@
dnl debian woody's archaic auto* tools don't set PACKAGE/VERSION correctly via
dnl AC_INIT above, so we do it again here.
-AM_INIT_AUTOMAKE(libapreq2, 2.12)
+AM_INIT_AUTOMAKE(libapreq2, 2.13)
AC_PROG_MAKE_SET
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm Tue Mar 10 00:18:20 2009
@@ -9,7 +9,7 @@
use overload '""' => sub { shift->as_string() }, fallback => 1;
push our @ISA, "APR::Request::Cookie";
-our $VERSION = "2.12";
+our $VERSION = "2.13";
sub new {
my ($class, $r, %attrs) = @_;
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm Tue Mar 10 00:18:20 2009
@@ -3,7 +3,7 @@
use APR::Request::Apache2;
use Apache2::RequestRec;
push our @ISA, qw/Apache2::RequestRec APR::Request::Apache2/;
-our $VERSION = "2.12";
+our $VERSION = "2.13";
my %old_limits = (
post_max => "read_limit",
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm Tue Mar 10 00:18:20 2009
@@ -1,7 +1,7 @@
package Apache2::Upload;
use Apache2::Request;
push our @ISA, qw/APR::Request::Param/;
-our $VERSION = "2.12";
+our $VERSION = "2.13";
no strict 'refs';
for (qw/slurp type size link tempname fh io filename/) {
*{$_} = *{"APR::Request::Param::upload_$_"}{CODE};
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod Tue Mar 10 00:18:20
2009
@@ -21,7 +21,7 @@
The APR::Request::Apache2 module provides a constructor
for interfacing with the mod_apreq2 Apache module.
-This manpage documents version 2.12 of
+This manpage documents version 2.13 of
the APR::Request::Apache2 package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod Tue Mar 10 00:18:20 2009
@@ -22,7 +22,7 @@
The APR::Request::CGI module provides a constructor
for accessing CGI request data associated to a pool via libapreq2.
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::CGI package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod Tue Mar 10 00:18:20
2009
@@ -63,7 +63,7 @@
for interfacing with libapreq2's cookie API. It also provides
a few utility functions and constants.
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::Cookie package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod Tue Mar 10 00:18:20
2009
@@ -16,7 +16,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::Error package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod Tue Mar 10 00:18:20 2009
@@ -18,7 +18,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::Hook package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod Tue Mar 10 00:18:20
2009
@@ -76,7 +76,7 @@
for interfacing with libapreq2's param API. It also provides
a few utility functions and constants.
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::Param, APR::Request::Brigade,
and APR::Request::Brigade::IO packages.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod Tue Mar 10 00:18:20
2009
@@ -18,7 +18,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request::Parser package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod?rev=751918&r1=751917&r2=751918&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod Tue Mar 10 00:18:20 2009
@@ -69,7 +69,7 @@
for interfacing with libapreq2's module API. It also provides
a few utility functions and constants.
-This manpage documents version 2.12
+This manpage documents version 2.13
of the APR::Request, APR::Request::Custom,
APR::Request::Cookie::Table, and
APR::Request::Param::Table packages.
Author: joes
Date: Fri Mar 6 19:21:08 2009
New Revision: 751042
URL: http://svn.apache.org/viewvc?rev=751042&view=rev
Log:
get rid of .deps once and for all
Modified:
httpd/apreq/trunk/MANIFEST.SKIP
httpd/apreq/trunk/Makefile.am
Modified: httpd/apreq/trunk/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/MANIFEST.SKIP?rev=751042&r1=751041&r2=751042&view=diff
==============================================================================
--- httpd/apreq/trunk/MANIFEST.SKIP (original)
+++ httpd/apreq/trunk/MANIFEST.SKIP Fri Mar 6 19:21:08 2009
@@ -21,6 +21,8 @@
\.a$
\.slo$
\.so$
+\.deps$
+\.deps/
# perl glue
glue/perl/blib
Modified: httpd/apreq/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/Makefile.am?rev=751042&r1=751041&r2=751042&view=diff
==============================================================================
--- httpd/apreq/trunk/Makefile.am (original)
+++ httpd/apreq/trunk/Makefile.am Fri Mar 6 19:21:08 2009
@@ -37,12 +37,11 @@
TAR=@TAR@
-release: reconfig docs_clean docs distdir
+release: distclean docs_clean reconfig distdir
@PERL@ build/version_check.pl > $(distdir)/PREREQUISITES
@PERL@ build/version_check.pl -version=@PACKAGE_VERSION@ > $(distdir)/META.yml
echo MANIFEST > $(distdir)/MANIFEST
@cd $(distdir); @PERL@ -M$(EUM) -e "$(EUM)::mkmanifest"
- if [ ! -x $(TAR) ]; then echo "$(TAR) is not executable."; fi
@PERL@ -ple '$$_="$(distdir)/$$_"' $(distdir)/MANIFEST | $(TAR) -czf $(distdir).tar.gz -T
-
rm -rf $(distdir)
@echo "Made $(distdir).tar.gz"
Author: joes
Date: Fri Mar 6 19:20:06 2009
New Revision: 751041
URL: http://svn.apache.org/viewvc?rev=751041&view=rev
Log:
get rid of .deps once and for all
Modified:
httpd/apreq/branches/v2_12/MANIFEST.SKIP
httpd/apreq/branches/v2_12/Makefile.am
Modified: httpd/apreq/branches/v2_12/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/MANIFEST.SKIP?rev=751041&r1=751040&r2=751041&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/MANIFEST.SKIP (original)
+++ httpd/apreq/branches/v2_12/MANIFEST.SKIP Fri Mar 6 19:20:06 2009
@@ -21,6 +21,8 @@
\.a$
\.slo$
\.so$
+\.deps$
+\.deps/
# perl glue
glue/perl/blib
Modified: httpd/apreq/branches/v2_12/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/Makefile.am?rev=751041&r1=751040&r2=751041&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/Makefile.am (original)
+++ httpd/apreq/branches/v2_12/Makefile.am Fri Mar 6 19:20:06 2009
@@ -37,12 +37,11 @@
TAR=@TAR@
-release: reconfig docs_clean docs distdir
+release: distclean docs_clean reconfig distdir
@PERL@ build/version_check.pl > $(distdir)/PREREQUISITES
@PERL@ build/version_check.pl -version=@PACKAGE_VERSION@ > $(distdir)/META.yml
echo MANIFEST > $(distdir)/MANIFEST
@cd $(distdir); @PERL@ -M$(EUM) -e "$(EUM)::mkmanifest"
- if [ ! -x $(TAR) ]; then echo "$(TAR) is not executable."; fi
@PERL@ -ple '$$_="$(distdir)/$$_"' $(distdir)/MANIFEST | $(TAR) -czf $(distdir).tar.gz -T
-
rm -rf $(distdir)
@echo "Made $(distdir).tar.gz"
Author: joes
Date: Fri Mar 6 18:33:22 2009
New Revision: 751026
URL: http://svn.apache.org/viewvc?rev=751026&view=rev
Log:
let distclean go into library/t
Modified:
httpd/apreq/trunk/library/Makefile.am
Modified: httpd/apreq/trunk/library/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/Makefile.am?rev=751026&r1=751025&r2=751026&view=diff
==============================================================================
--- httpd/apreq/trunk/library/Makefile.am (original)
+++ httpd/apreq/trunk/library/Makefile.am Fri Mar 6 18:33:22 2009
@@ -23,7 +23,9 @@
cd t; $(MAKE) clean
endif
-
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+ cd t; $(MAKE) distclean
if BUILD_APR
Author: joes
Date: Fri Mar 6 18:25:10 2009
New Revision: 751022
URL: http://svn.apache.org/viewvc?rev=751022&view=rev
Log:
let distclean go into library/t
Modified:
httpd/apreq/branches/v2_12/library/Makefile.am
Modified: httpd/apreq/branches/v2_12/library/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/library/Makefile.am?rev=751022&r1=751021&r2=751022&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/library/Makefile.am (original)
+++ httpd/apreq/branches/v2_12/library/Makefile.am Fri Mar 6 18:25:10 2009
@@ -23,7 +23,9 @@
cd t; $(MAKE) clean
endif
-
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+ cd t; $(MAKE) distclean
if BUILD_APR
Author: joes
Date: Fri Mar 6 00:42:53 2009
New Revision: 750716
URL: http://svn.apache.org/viewvc?rev=750716&view=rev
Log:
2.12 release started
Modified:
httpd/apreq/branches/v2_12/CHANGES
httpd/apreq/branches/v2_12/STATUS
httpd/apreq/branches/v2_12/include/apreq_version.h
Modified: httpd/apreq/branches/v2_12/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/CHANGES?rev=750716&r1=750715&r2=750716&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/CHANGES (original)
+++ httpd/apreq/branches/v2_12/CHANGES Fri Mar 6 00:42:53 2009
@@ -1,7 +1,7 @@
/** @page apreq_changes CHANGES
//! brief List of major changes.
-@section v2_12 Changes with libapreq2-2.12 (in development)
+@section v2_12 Changes with libapreq2-2.12 (released March 13, 2009)
- C API [joes]
Make the cookie parser a little more flexible.
Modified: httpd/apreq/branches/v2_12/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/STATUS?rev=750716&r1=750715&r2=750716&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/STATUS (original)
+++ httpd/apreq/branches/v2_12/STATUS Fri Mar 6 00:42:53 2009
@@ -1,6 +1,6 @@
/** @page apreq_status STATUS
- 2.12 under developement
+ 2.12 released on March 13, 2009
Contributors looking for a mission:
Modified: httpd/apreq/branches/v2_12/include/apreq_version.h
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_12/include/apreq_version.h?rev=750716&r1=750715&r2=750716&view=diff
==============================================================================
--- httpd/apreq/branches/v2_12/include/apreq_version.h (original)
+++ httpd/apreq/branches/v2_12/include/apreq_version.h Fri Mar 6 00:42:53 2009
@@ -68,7 +68,7 @@
* This symbol is defined for internal, "development" copies of libapreq.
* This symbol will be \#undef'd for releases.
*/
-#define APREQ_IS_DEV_VERSION
+#undef APREQ_IS_DEV_VERSION
/** The formatted string of libapreq's version */
Author: joes
Date: Fri Mar 6 00:37:04 2009
New Revision: 750710
URL: http://svn.apache.org/viewvc?rev=750710&view=rev
Log:
create release branch for 2.12
Added:
httpd/apreq/branches/v2_12/
- copied from r750709, httpd/apreq/trunk/
Author: joes
Date: Thu Mar 5 23:28:45 2009
New Revision: 750678
URL: http://svn.apache.org/viewvc?rev=750678&view=rev
Log:
fix
Modified:
httpd/apreq/trunk/CHANGES
Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=750678&r1=750677&r2=750678&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Thu Mar 5 23:28:45 2009
@@ -1,7 +1,7 @@
/** @page apreq_changes CHANGES
//! brief List of major changes.
-@section v2_11 Changes with libapreq2-2.12 (in development)
+@section v2_12 Changes with libapreq2-2.12 (in development)
- C API [joes]
Make the cookie parser a little more flexible.
Author: joes
Date: Thu Mar 5 16:57:32 2009
New Revision: 750510
URL: http://svn.apache.org/viewvc?rev=750510&view=rev
Log:
use Steve Hay's patch instead
Modified:
httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=750510&r1=750509&r2=750510&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Thu Mar 5 16:57:32 2009
@@ -146,10 +146,10 @@
*
*/
#ifdef WIN32
-typedef apreq_handle_t * (__stdcall apr_OFN_apreq_handle_apache2_t)
- (request_rec *r);
+typedef __declspec(dllexport) apreq_handle_t *
+(__stdcall apr_OFN_apreq_handle_apache2_t) (request_rec *r);
#else
-APR_DECLARE_OPTIONAL_FN(apreq_handle_t *,
+APR_DECLARE_OPTIONAL_FN(APREQ_DECLARE(apreq_handle_t *),
apreq_handle_apache2, (request_rec *r));
#endif
Author: joes
Date: Thu Mar 5 16:34:15 2009
New Revision: 750502
URL: http://svn.apache.org/viewvc?rev=750502&view=rev
Log:
more fixes based on list feedback
Modified:
httpd/apreq/trunk/library/Makefile.am
httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
Modified: httpd/apreq/trunk/library/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/Makefile.am?rev=750502&r1=750501&r2=750502&view=diff
==============================================================================
--- httpd/apreq/trunk/library/Makefile.am (original)
+++ httpd/apreq/trunk/library/Makefile.am Thu Mar 5 16:34:15 2009
@@ -16,11 +16,11 @@
clean-local:
-rm *.bb *.bbg *.da *.gcov
-
+ cd t; $(MAKE) clean
else
clean-local:
-
+ cd t; $(MAKE) clean
endif
Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=750502&r1=750501&r2=750502&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Thu Mar 5 16:34:15 2009
@@ -146,8 +146,8 @@
*
*/
#ifdef WIN32
-APR_DECLARE_OPTIONAL_FN(apreq_handle_t * __stdcall,
- apreq_handle_apache2, (request_rec *r));
+typedef apreq_handle_t * (__stdcall apr_OFN_apreq_handle_apache2_t)
+ (request_rec *r);
#else
APR_DECLARE_OPTIONAL_FN(apreq_handle_t *,
apreq_handle_apache2, (request_rec *r));
Author: joes
Date: Thu Mar 5 12:59:56 2009
New Revision: 750449
URL: http://svn.apache.org/viewvc?rev=750449&view=rev
Log:
more Win32 fu
Modified:
httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=750449&r1=750448&r2=750449&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Thu Mar 5 12:59:56 2009
@@ -145,8 +145,13 @@
*
*
*/
-APR_DECLARE_OPTIONAL_FN(APREQ_DECLARE(apreq_handle_t *),
+#ifdef WIN32
+APR_DECLARE_OPTIONAL_FN(apreq_handle_t * __stdcall,
apreq_handle_apache2, (request_rec *r));
+#else
+APR_DECLARE_OPTIONAL_FN(apreq_handle_t *,
+ apreq_handle_apache2, (request_rec *r));
+#endif
/**
* The mod_apreq2 filter is named "apreq2", and may be used in Apache's
Author: joes
Date: Tue Mar 3 21:01:50 2009
New Revision: 749751
URL: http://svn.apache.org/viewvc?rev=749751&view=rev
Log:
update RELEASE docs
Modified:
httpd/apreq/trunk/build/RELEASE
Modified: httpd/apreq/trunk/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/RELEASE?rev=749751&r1=749750&r2=749751&view=diff
==============================================================================
--- httpd/apreq/trunk/build/RELEASE (original)
+++ httpd/apreq/trunk/build/RELEASE Tue Mar 3 21:01:50 2009
@@ -5,7 +5,7 @@
1. Create a realease branch:
svn cp https://svn.apache.org/repos/asf/httpd/apreq/trunk \
- https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09
+ https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_12
2. On the BRANCH
@@ -13,13 +13,13 @@
/** @page STATUS
- 2.09 released on <today's date>.
+ 2.12 released on <one week from today's date>.
Also add the release date to the top @section in CHANGES:
/** @page CHANGES
- @section v2_09 Changes with libapreq2-2.09 (released ...).
+ @section v2_12 Changes with libapreq2-2.12 (released ...).
And #undef the APREQ_VERSION_IS_DEV macro definition
in include/apreq_version.h:
@@ -28,21 +28,21 @@
*/
#undef APREQ_IS_DEV_VERSION
- % svn commit -m "2.09 release started" STATUS CHANGES include/apreq_version.h
+ % svn commit -m "2.12 release started" STATUS CHANGES include/apreq_version.h
3. On TRUNK:
Update CHANGES and STATUS to reflect the start of a new develoment cycle,
and run this to update the package version numbers throughout the tree:
- % build/update_version.pl 2.10
+ % build/update_version.pl 2.13
- % svn commit -m "2.10 cycle"
+ % svn commit -m "2.13 cycle"
4. Prep the package for CPAN by running:
% make release
- This will generate a libapreq2-2.09.tar.gz candidate in the
+ This will generate a libapreq2-2.12.tar.gz candidate in the
current directory. You should keep this source tree
intact to tag the final release.
@@ -55,11 +55,11 @@
6. Sign it via gpg:
- % gpg --detach-sign --armor libapreq2-2.09.tar.gz
+ % gpg --detach-sign --armor libapreq2-2.12.tar.gz
or pgp:
- % pgp -sba libapreq2-2.09.tar.gz
+ % pgp -sba libapreq2-2.12.tar.gz
7. Upload the release candidate to people.apache.org/~username
and post a candidate announcement to apreq-dev@. Also, it is
@@ -67,7 +67,7 @@
announcement to the modperl@ list, to solicit feedback
from a much larger audience.
- Subject: [RELEASE CANDIDATE] libapreq2 2.10 RC\d+
+ Subject: [RELEASE CANDIDATE] libapreq2 2.12 RC\d+
8. Give the mailing list participants 48-72 hours to comment and
vote on the candidate. If there is a "majority consensus"
@@ -77,19 +77,19 @@
9. Tag the Release -- from the BRANCH
- svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09 \
- https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_09
+ svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_12 \
+ https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_12
10. Upload (scp) the package and signature to www.apache.org
for distribution:
- % scp libapreq2-2.09.tar.gz* \
+ % scp libapreq2-2.12.tar.gz* \
$USER@people.apache.org:/www/www.apache.org/dist/httpd/libapreq/
Ask another developer to confirm the uploaded signature is ok.
- % gpg --verify libapreq2-2.09.tar.gz.asc
- % pgp libapreq2-2.09.tar.gz.asc
+ % gpg --verify libapreq2-2.12.tar.gz.asc
+ % pgp libapreq2-2.12.tar.gz.asc
Check that your public key is among those listed in the
/www/www.apache.org/dist/httpd/KEYS file. If not, you
Author: joes
Date: Tue Mar 3 05:21:19 2009
New Revision: 749532
URL: http://svn.apache.org/viewvc?rev=749532&view=rev
Log:
add libapreq.rc to EXTRA_DIST so it gets
included in the release tarball
Modified:
httpd/apreq/trunk/Makefile.am
Modified: httpd/apreq/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/Makefile.am?rev=749532&r1=749531&r2=749532&view=diff
==============================================================================
--- httpd/apreq/trunk/Makefile.am (original)
+++ httpd/apreq/trunk/Makefile.am Tue Mar 3 05:21:19 2009
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = . include library module glue
-EXTRA_DIST = LICENSE NOTICE README INSTALL CHANGES STATUS FAQ.pod MANIFEST.SKIP Makefile.PL
buildconf build win32 docs
+EXTRA_DIST = LICENSE NOTICE README INSTALL CHANGES STATUS FAQ.pod MANIFEST.SKIP Makefile.PL
buildconf build win32 docs libapreq.rc
APU_SRCDIR=`@APU_CONFIG@ --srcdir`
APR_SRCDIR=`@APR_CONFIG@ --srcdir`
APU_DOX = (cd $(APU_SRCDIR); cat docs/doxygen.conf - | doxygen -)
Author: joes
Date: Tue Mar 3 04:01:12 2009
New Revision: 749522
URL: http://svn.apache.org/viewvc?rev=749522&view=rev
Log:
bump package version
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/STATUS
httpd/apreq/trunk/configure.ac
httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm
httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm
httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod
httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod
Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Tue Mar 3 04:01:12 2009
@@ -1,11 +1,13 @@
/** @page apreq_changes CHANGES
//! brief List of major changes.
-@section v2_11 Changes with libapreq2-2.11 (in development)
+@section v2_11 Changes with libapreq2-2.12 (in development)
- C API [joes]
Make the cookie parser a little more flexible.
+@section v2_11 Changes with libapreq2-2.11 (not released)
+
- Interactive CGI module [issac]
Allow cgi module to interactively prompt for parameters and cookies when
running a script from the command line and not from a CGI interface
Modified: httpd/apreq/trunk/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/STATUS?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/STATUS (original)
+++ httpd/apreq/trunk/STATUS Tue Mar 3 04:01:12 2009
@@ -1,6 +1,6 @@
/** @page apreq_status STATUS
- 2.11 under developement
+ 2.12 under developement
Contributors looking for a mission:
Modified: httpd/apreq/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/configure.ac?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/configure.ac (original)
+++ httpd/apreq/trunk/configure.ac Tue Mar 3 04:01:12 2009
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT(Apache HTTP Server Request Library, 2.11, apreq-dev@httpd.apache.org, libapreq2)
+AC_INIT(Apache HTTP Server Request Library, 2.12, apreq-dev@httpd.apache.org, libapreq2)
dnl Generate config.nice script- macro must be here at the top
dnl to avoid corruption of $0 and $@.
APR_CONFIG_NICE(config.nice)
@@ -13,7 +13,7 @@
dnl debian woody's archaic auto* tools don't set PACKAGE/VERSION correctly via
dnl AC_INIT above, so we do it again here.
-AM_INIT_AUTOMAKE(libapreq2, 2.11)
+AM_INIT_AUTOMAKE(libapreq2, 2.12)
AC_PROG_MAKE_SET
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Cookie.pm Tue Mar 3 04:01:12 2009
@@ -9,7 +9,7 @@
use overload '""' => sub { shift->as_string() }, fallback => 1;
push our @ISA, "APR::Request::Cookie";
-our $VERSION = "2.11";
+our $VERSION = "2.12";
sub new {
my ($class, $r, %attrs) = @_;
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Request.pm Tue Mar 3 04:01:12 2009
@@ -3,7 +3,7 @@
use APR::Request::Apache2;
use Apache2::RequestRec;
push our @ISA, qw/Apache2::RequestRec APR::Request::Apache2/;
-our $VERSION = "2.11";
+our $VERSION = "2.12";
my %old_limits = (
post_max => "read_limit",
Modified: httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm (original)
+++ httpd/apreq/trunk/glue/perl/lib/Apache2/Upload.pm Tue Mar 3 04:01:12 2009
@@ -1,7 +1,7 @@
package Apache2::Upload;
use Apache2::Request;
push our @ISA, qw/APR::Request::Param/;
-our $VERSION = "2.11";
+our $VERSION = "2.12";
no strict 'refs';
for (qw/slurp type size link tempname fh io filename/) {
*{$_} = *{"APR::Request::Param::upload_$_"}{CODE};
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Apache2/Apache2.pod Tue Mar 3 04:01:12
2009
@@ -21,7 +21,7 @@
The APR::Request::Apache2 module provides a constructor
for interfacing with the mod_apreq2 Apache module.
-This manpage documents version 2.11 of
+This manpage documents version 2.12 of
the APR::Request::Apache2 package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/CGI/CGI.pod Tue Mar 3 04:01:12 2009
@@ -22,7 +22,7 @@
The APR::Request::CGI module provides a constructor
for accessing CGI request data associated to a pool via libapreq2.
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::CGI package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Cookie/Cookie.pod Tue Mar 3 04:01:12
2009
@@ -63,7 +63,7 @@
for interfacing with libapreq2's cookie API. It also provides
a few utility functions and constants.
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::Cookie package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Error/Error.pod Tue Mar 3 04:01:12
2009
@@ -16,7 +16,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::Error package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Hook/Hook.pod Tue Mar 3 04:01:12 2009
@@ -18,7 +18,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::Hook package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Param/Param.pod Tue Mar 3 04:01:12
2009
@@ -76,7 +76,7 @@
for interfacing with libapreq2's param API. It also provides
a few utility functions and constants.
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::Param, APR::Request::Brigade,
and APR::Request::Brigade::IO packages.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Parser/Parser.pod Tue Mar 3 04:01:12
2009
@@ -18,7 +18,7 @@
=head1 DESCRIPTION
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request::Parser package.
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod?rev=749522&r1=749521&r2=749522&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/APR/Request/Request.pod Tue Mar 3 04:01:12 2009
@@ -69,7 +69,7 @@
for interfacing with libapreq2's module API. It also provides
a few utility functions and constants.
-This manpage documents version 2.11
+This manpage documents version 2.12
of the APR::Request, APR::Request::Custom,
APR::Request::Cookie::Table, and
APR::Request::Param::Table packages.
Author: joes
Date: Sat Feb 28 08:25:30 2009
New Revision: 748790
URL: http://svn.apache.org/viewvc?rev=748790&view=rev
Log:
don't change the tests,
they were right the first time ;-)
Modified:
httpd/apreq/trunk/library/cookie.c
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/library/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/cookie.c?rev=748790&r1=748789&r2=748790&view=diff
==============================================================================
--- httpd/apreq/trunk/library/cookie.c (original)
+++ httpd/apreq/trunk/library/cookie.c Sat Feb 28 08:25:30 2009
@@ -382,16 +382,7 @@
status = get_pair(p, &hdr, &name, &nlen, &value, &vlen, 0);
- switch (status) {
-
- case APREQ_ERROR_NOTOKEN:
- rv = status;
- /* fall thru */
-
- case APR_SUCCESS:
- break;
-
- default:
+ if (status != APR_SUCCESS) {
c = NULL;
rv = status;
goto parse_cookie_error;
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=748790&r1=748789&r2=748790&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Sat Feb 28 08:25:30 2009
@@ -110,8 +110,8 @@
AT_str_eq(apr_table_get(jar, "a"), "1");
- /* accept wacky cookies that don't have an '=' sign */
- AT_not_null(apr_table_get(jar, "bad"));
+ /* ignore wacky cookies that don't have an '=' sign */
+ AT_is_null(apr_table_get(jar, "bad"));
/* accept wacky cookies that contain multiple '=' */
AT_str_eq(apr_table_get(jar, "ns"), "foo=1&bar=2");
Author: joes
Date: Sat Feb 28 07:16:23 2009
New Revision: 748782
URL: http://svn.apache.org/viewvc?rev=748782&view=rev
Log:
soften up the cookie parser
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/acinclude.m4
httpd/apreq/trunk/include/apreq_version.h
httpd/apreq/trunk/library/cookie.c
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=748782&r1=748781&r2=748782&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Sat Feb 28 07:16:23 2009
@@ -3,6 +3,9 @@
@section v2_11 Changes with libapreq2-2.11 (in development)
+- C API [joes]
+ Make the cookie parser a little more flexible.
+
- Interactive CGI module [issac]
Allow cgi module to interactively prompt for parameters and cookies when
running a script from the command line and not from a CGI interface
Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?rev=748782&r1=748781&r2=748782&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Sat Feb 28 07:16:23 2009
@@ -213,7 +213,7 @@
if test "x$USE_MAINTAINER_MODE" != "xno"; then
APR_ADDTO([CFLAGS],[
-fno-strict-aliasing
- -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes
+ -Wall -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations -Wwrite-strings -Wcast-qual
-Wfloat-equal -Wshadow -Wpointer-arith
-Wbad-function-cast -Wsign-compare -Waggregate-return
Modified: httpd/apreq/trunk/include/apreq_version.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/include/apreq_version.h?rev=748782&r1=748781&r2=748782&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq_version.h (original)
+++ httpd/apreq/trunk/include/apreq_version.h Sat Feb 28 07:16:23 2009
@@ -62,7 +62,7 @@
#define APREQ_MINOR_VERSION 7
/** patch level */
-#define APREQ_PATCH_VERSION 0
+#define APREQ_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of libapreq.
Modified: httpd/apreq/trunk/library/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/cookie.c?rev=748782&r1=748781&r2=748782&view=diff
==============================================================================
--- httpd/apreq/trunk/library/cookie.c (original)
+++ httpd/apreq/trunk/library/cookie.c Sat Feb 28 07:16:23 2009
@@ -168,29 +168,52 @@
const char **v, apr_size_t *vlen, unsigned unquote)
{
const char *hdr, *key, *val;
-
+ int nlen_set = 0;
hdr = *data;
while (apr_isspace(*hdr) || *hdr == '=')
++hdr;
- key = strchr(hdr, '=');
+ key = hdr;
+ *n = hdr;
- if (key == NULL)
- return APREQ_ERROR_NOTOKEN;
+ scan_name:
- val = key + 1;
+ switch (*hdr) {
- do --key;
- while (key > hdr && apr_isspace(*key));
+ case 0:
+ case ';':
+ case ',':
+ if (!nlen_set)
+ *nlen = hdr - key;
+ *v = hdr;
+ *vlen = 0;
+ *data = hdr;
+ return *nlen ? APREQ_ERROR_NOTOKEN : APREQ_ERROR_BADCHAR;
+
+ case '=':
+ if (!nlen_set) {
+ *nlen = hdr - key;
+ nlen_set = 1;
+ }
+ break;
- *n = key;
+ case ' ':
+ case '\t':
+ case '\r':
+ case '\n':
+ if (!nlen_set) {
+ *nlen = hdr - key;
+ nlen_set = 1;
+ }
+ /* fall thru */
- while (key >= hdr && !apr_isspace(*key))
- --key;
+ default:
+ ++hdr;
+ goto scan_name;
+ }
- *nlen = *n - key;
- *n = key + 1;
+ val = hdr + 1;
while (apr_isspace(*val))
++val;
@@ -231,6 +254,7 @@
}
}
/* bad sequence: no terminating quote found */
+ *data = val;
return APREQ_ERROR_BADSEQ;
}
else {
@@ -266,6 +290,7 @@
{
apreq_cookie_t *c;
unsigned version;
+ apr_status_t rv = APR_SUCCESS;
parse_cookie_header:
@@ -276,13 +301,13 @@
++hdr;
- if (*hdr == '$') {
- /* XXX cheat: assume "$..." => "$Version" => RFC Cookie header */
+ if (*hdr == '$' && strncasecmp(hdr, "$Version", 8) == 0) {
+ /* XXX cheat: assume "$Version" => RFC Cookie header */
version = RFC;
skip_version_string:
switch (*hdr++) {
case 0:
- return APR_SUCCESS;
+ return rv;
case ',':
goto parse_cookie_header;
case ';':
@@ -307,7 +332,7 @@
if (c != NULL) {
ADD_COOKIE(j, c);
}
- return APR_SUCCESS;
+ return rv;
case ',':
++hdr;
@@ -317,29 +342,35 @@
goto parse_cookie_header;
case '$':
+ ++hdr;
if (c == NULL) {
- return APREQ_ERROR_BADCHAR;
+ rv = APREQ_ERROR_BADCHAR;
+ goto parse_cookie_error;
}
else if (version == NETSCAPE) {
- return APREQ_ERROR_MISMATCH;
+ rv = APREQ_ERROR_MISMATCH;
}
- ++hdr;
status = get_pair(p, &hdr, &name, &nlen, &value, &vlen, 1);
- if (status != APR_SUCCESS)
- return status;
+ if (status != APR_SUCCESS) {
+ rv = status;
+ goto parse_cookie_error;
+ }
status = apreq_cookie_attr(p, c, name, nlen, value, vlen);
switch (status) {
+
case APR_ENOTIMPL:
- /* XXX: skip unrecognized attr? Not really correct,
- but for now, just fall through */
+ rv = APREQ_ERROR_BADATTR;
+ /* fall thru */
case APR_SUCCESS:
break;
+
default:
- return status;
+ rv = status;
+ goto parse_cookie_error;
}
break;
@@ -351,8 +382,20 @@
status = get_pair(p, &hdr, &name, &nlen, &value, &vlen, 0);
- if (status != APR_SUCCESS)
- return status;
+ switch (status) {
+
+ case APREQ_ERROR_NOTOKEN:
+ rv = status;
+ /* fall thru */
+
+ case APR_SUCCESS:
+ break;
+
+ default:
+ c = NULL;
+ rv = status;
+ goto parse_cookie_error;
+ }
c = apreq_cookie_make(p, name, nlen, value, vlen);
apreq_cookie_tainted_on(c);
@@ -361,8 +404,27 @@
}
}
- /* NOT REACHED */
- return APREQ_ERROR_GENERAL;
+ parse_cookie_error:
+
+ switch (*hdr) {
+
+ case 0:
+ return rv;
+
+ case ',':
+ case ';':
+ if (c != NULL)
+ ADD_COOKIE(j, c);
+ ++hdr;
+ goto parse_cookie_header;
+
+ default:
+ ++hdr;
+ goto parse_cookie_error;
+ }
+
+ /* not reached */
+ return rv;
}
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=748782&r1=748781&r2=748782&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Sat Feb 28 07:16:23 2009
@@ -110,8 +110,8 @@
AT_str_eq(apr_table_get(jar, "a"), "1");
- /* ignore wacky cookies that don't have an '=' sign */
- AT_is_null(apr_table_get(jar, "bad"));
+ /* accept wacky cookies that don't have an '=' sign */
+ AT_not_null(apr_table_get(jar, "bad"));
/* accept wacky cookies that contain multiple '=' */
AT_str_eq(apr_table_get(jar, "ns"), "foo=1&bar=2");
Author: joes
Date: Mon Feb 16 14:42:52 2009
New Revision: 744924
URL: http://svn.apache.org/viewvc?rev=744924&view=rev
Log:
parses cleanly if the , in the cookie
is within a quoted value
Modified:
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=744924&r1=744923&r2=744924&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Mon Feb 16 14:42:52 2009
@@ -62,9 +62,9 @@
"62.4479471199095321000.1234471650.12344"
"71650.1234471650.1; __utmb=144149162.24"
".10.1234471650; __utmc=144149162; __utm"
- "z=144149162.1234471650.1.1.utmcsr=szuka"
- "j.xxxx.pl|utmccn=(referral)|utmcmd=refe"
- "rral|utmcct=/internet/0,0.html";
+ "z=\"144149162.1234471650.1.1.utmcsr=szu"
+ "kaj.xxxx.pl|utmccn=(referral)|utmcmd=re"
+ "ferral|utmcct=/internet/0,0.html\"";
static apr_table_t *jar, *jar2, *jar3, *jar4, *jar5, *jar6, *jar7;
static apr_pool_t *p;
@@ -91,7 +91,7 @@
AT_int_eq(apreq_parse_cookie_header(p, jar6, cgcookies3), APREQ_ERROR_MISMATCH);
jar7 = apr_table_make(p, APREQ_DEFAULT_NELTS);
AT_not_null(jar7);
- AT_int_eq(apreq_parse_cookie_header(p, jar7, cgcookies4), APREQ_ERROR_NOTOKEN);
+ AT_int_eq(apreq_parse_cookie_header(p, jar7, cgcookies4), APR_SUCCESS);
}
static void jar_get_rfc(dAT)
Author: joes
Date: Mon Feb 16 11:08:15 2009
New Revision: 744892
URL: http://svn.apache.org/viewvc?rev=744892&view=rev
Log:
add Clinton Gormley's cookie list
to the tests
Modified:
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=744892&r1=744891&r2=744892&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Mon Feb 16 11:08:15 2009
@@ -38,7 +38,35 @@
"abit=0-,1-,2-,3-,4-,5-,6-&advancedstuff"
"=0-,1+,2-";
-static apr_table_t *jar, *jar2, *jar3;
+static const char cgcookies1[] = "UID=MTj9S8CoAzMAAFEq21YAAAAG|c85a9e59db"
+ "92b261408eb7539ff7f949b92c7d58; $Versio"
+ "n=0;SID=MTj9S8CoAzMAAFEq21YAAAAG|c85a9e"
+ "59db92b261408eb7539ff7f949b92c7d58;$Dom"
+ "ain=www.xxxx.com;$Path=/";
+
+static const char cgcookies2[] = "UID=Gh9VxX8AAAIAAHP7h6AAAAAC|2e809a9cc9"
+ "9c2dca778c385ebdefc5cb86c95dc3; SID=Gh9"
+ "VxX8AAAIAAHP7h6AAAAAC|2e809a9cc99c2dca7"
+ "78c385ebdefc5cb86c95dc3; $Version=1";
+
+static const char cgcookies3[] = "UID=hCijN8CoAzMAAGVDO2QAAAAF|50299f0793"
+ "43fd6146257c105b1370f2da78246a; SID=hCi"
+ "jN8CoAzMAAGVDO2QAAAAF|50299f079343fd614"
+ "6257c105b1370f2da78246a; $Path=\"/\"; $"
+ "Domain=\"www.xxxx.com\"";
+
+static const char cgcookies4[] = "SID=66XUEH8AAAIAAFmLLRkAAAAV|2a48c4ae2e"
+ "9fb8355e75192db211f0779bdce244; UID=66X"
+ "UEH8AAAIAAFmLLRkAAAAV|2a48c4ae2e9fb8355"
+ "e75192db211f0779bdce244; __utma=1441491"
+ "62.4479471199095321000.1234471650.12344"
+ "71650.1234471650.1; __utmb=144149162.24"
+ ".10.1234471650; __utmc=144149162; __utm"
+ "z=144149162.1234471650.1.1.utmcsr=szuka"
+ "j.xxxx.pl|utmccn=(referral)|utmcmd=refe"
+ "rral|utmcct=/internet/0,0.html";
+
+static apr_table_t *jar, *jar2, *jar3, *jar4, *jar5, *jar6, *jar7;
static apr_pool_t *p;
static void jar_make(dAT)
@@ -52,6 +80,18 @@
jar3 = apr_table_make(p, APREQ_DEFAULT_NELTS);
AT_not_null(jar3);
AT_int_eq(apreq_parse_cookie_header(p, jar3, wpcookies), APREQ_ERROR_NOTOKEN);
+ jar4 = apr_table_make(p, APREQ_DEFAULT_NELTS);
+ AT_not_null(jar4);
+ AT_int_eq(apreq_parse_cookie_header(p, jar4, cgcookies1), APREQ_ERROR_MISMATCH);
+ jar5 = apr_table_make(p, APREQ_DEFAULT_NELTS);
+ AT_not_null(jar5);
+ AT_int_eq(apreq_parse_cookie_header(p, jar5, cgcookies2), APREQ_ERROR_MISMATCH);
+ jar6 = apr_table_make(p, APREQ_DEFAULT_NELTS);
+ AT_not_null(jar6);
+ AT_int_eq(apreq_parse_cookie_header(p, jar6, cgcookies3), APREQ_ERROR_MISMATCH);
+ jar7 = apr_table_make(p, APREQ_DEFAULT_NELTS);
+ AT_not_null(jar7);
+ AT_int_eq(apreq_parse_cookie_header(p, jar7, cgcookies4), APREQ_ERROR_NOTOKEN);
}
static void jar_get_rfc(dAT)
@@ -178,7 +218,7 @@
unsigned i, plan = 0;
dAT;
at_test_t test_list [] = {
- { dT(jar_make, 6) },
+ { dT(jar_make, 14) },
{ dT(jar_get_rfc, 6), "1 3 5" },
{ dT(jar_get_ns, 10) },
{ dT(netscape_cookie, 7) },
Author: joes
Date: Sat Feb 14 08:01:52 2009
New Revision: 744417
URL: http://svn.apache.org/viewvc?rev=744417&view=rev
Log:
try do fix WinFu
Modified:
httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=744417&r1=744416&r2=744417&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Sat Feb 14 08:01:52 2009
@@ -145,7 +145,8 @@
*
*
*/
-APR_DECLARE_OPTIONAL_FN(apreq_handle_t *,apreq_handle_apache2, (request_rec *r));
+APR_DECLARE_OPTIONAL_FN(APREQ_DECLARE(apreq_handle_t *),
+ apreq_handle_apache2, (request_rec *r));
/**
* The mod_apreq2 filter is named "apreq2", and may be used in Apache's
Author: joes
Date: Sat Feb 14 05:43:50 2009
New Revision: 744402
URL: http://svn.apache.org/viewvc?rev=744402&view=rev
Log:
ugh, looking over the perl source
it seems we need an ENTER & LEAVE
block around Perl_load_module
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744402&r1=744401&r2=744402&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Sat Feb 14 05:43:50 2009
@@ -244,10 +244,11 @@
stash = gv_stashpv(class, FALSE);
if (stash == NULL) {
- SV *pkg_name = newSVpv(class, 0);
- Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, pkg_name, Nullsv);
+ ENTER;
+ Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT,
+ newSVpv(class, 0), Nullsv);
+ LEAVE;
stash = gv_stashpv(class, TRUE);
- SvREFCNT_dec(pkg_name);
}
if (obj != Nullsv)
Author: joes
Date: Sat Feb 14 04:57:51 2009
New Revision: 744390
URL: http://svn.apache.org/viewvc?rev=744390&view=rev
Log:
free pkg_name by decrementing
the refcnt instead of making
it mortal
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744390&r1=744389&r2=744390&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Sat Feb 14 04:57:51 2009
@@ -247,6 +247,7 @@
SV *pkg_name = newSVpv(class, 0);
Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, pkg_name, Nullsv);
stash = gv_stashpv(class, TRUE);
+ SvREFCNT_dec(pkg_name);
}
if (obj != Nullsv)
Author: joes
Date: Fri Feb 13 23:53:55 2009
New Revision: 744299
URL: http://svn.apache.org/viewvc?rev=744299&view=rev
Log:
add wordpess tests
Modified:
httpd/apreq/trunk/glue/perl/t/apreq/cookie.t
httpd/apreq/trunk/glue/perl/t/response/TestApReq/cookie.pm
Modified: httpd/apreq/trunk/glue/perl/t/apreq/cookie.t
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/t/apreq/cookie.t?rev=744299&r1=744298&r2=744299&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/t/apreq/cookie.t (original)
+++ httpd/apreq/trunk/glue/perl/t/apreq/cookie.t Fri Feb 13 23:53:55 2009
@@ -6,7 +6,7 @@
use Apache::TestUtil;
use Apache::TestRequest qw(GET_BODY GET_HEAD);
-plan tests => 13, need_min_module_version('Apache::Test' => 1.29) || need_lwp;
+plan tests => 14, need_min_module_version('Apache::Test' => 1.29) || need_lwp;
my $module = "TestApReq::cookie";
my $location = Apache::TestRequest::module2url($module);
@@ -157,3 +157,14 @@
ok t_cmp($str, $value, $test);
}
+{
+ my $test = 'wordpress';
+ my $cookie = qq{wordpressuser_c580712eb86cad2660b3601ac04202b2=admin;}
+ . qq{wordpresspass_c580712eb86cad2660b3601ac04202b2=7ebeeed42ef50}
+ . qq{720940f5b8db2f9db49; rs_session=59ae9b8b503e3af7d17b97e7}
+ . qq{f77f7ea5; dbx-postmeta=grabit=0-,1-,2-,3-,4-,5-,6-&a}
+ .qq {dvancedstuff=0-,1+,2-};
+ my $value = qq{ok};
+ my $str = GET_BODY("$location?test=$test", Cookie => $cookie);
+ ok t_cmp($str, $value, $test);
+}
Modified: httpd/apreq/trunk/glue/perl/t/response/TestApReq/cookie.pm
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/t/response/TestApReq/cookie.pm?rev=744299&r1=744298&r2=744299&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/t/response/TestApReq/cookie.pm (original)
+++ httpd/apreq/trunk/glue/perl/t/response/TestApReq/cookie.pm Fri Feb 13 23:53:55 2009
@@ -14,7 +14,7 @@
sub handler {
my $r = shift;
my $req = Apache2::Request->new($r);
- my %cookies = Apache2::Cookie->fetch($r);
+ my %cookies = eval { Apache2::Cookie->fetch($r) };
$r->content_type('text/plain');
my $test = $req->APR::Request::args('test');
@@ -39,6 +39,9 @@
elsif ($test eq 'overload') {
$r->print($cookies{one});
}
+ elsif ($test eq 'wordpress') {
+ $r->print("ok") if $@;
+ }
elsif ($key and $cookies{$key}) {
if ($test eq "bake") {
$cookies{$key}->bake($r);
Author: joes
Date: Fri Feb 13 23:53:15 2009
New Revision: 744298
URL: http://svn.apache.org/viewvc?rev=744298&view=rev
Log:
revert. this shouldn't be mortal
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744298&r1=744297&r2=744298&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Fri Feb 13 23:53:15 2009
@@ -244,7 +244,7 @@
stash = gv_stashpv(class, FALSE);
if (stash == NULL) {
- SV *pkg_name = sv_2mortal(newSVpv(class, 0));
+ SV *pkg_name = newSVpv(class, 0);
Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, pkg_name, Nullsv);
stash = gv_stashpv(class, TRUE);
}
Author: joes
Date: Fri Feb 13 23:27:31 2009
New Revision: 744281
URL: http://svn.apache.org/viewvc?rev=744281&view=rev
Log:
revert, yes mortal is correct here
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744281&r1=744280&r2=744281&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Fri Feb 13 23:27:31 2009
@@ -250,13 +250,13 @@
}
if (obj != Nullsv)
- sv_setsv(*hv_fetch(data, "_r", 2, 1), newRV_inc(obj));
+ sv_setsv(*hv_fetch(data, "_r", 2, 1), sv_2mortal(newRV_inc(obj)));
sv_setiv(*hv_fetch(data, "rc", 2, 1), rc);
sv_setpv(*hv_fetch(data, "file", 4, 1), CopFILE(PL_curcop));
sv_setiv(*hv_fetch(data, "line", 4, 1), CopLINE(PL_curcop));
sv_setpv(*hv_fetch(data, "func", 4, 1), func);
- sv_setsv(ERRSV, sv_bless(newRV_noinc((SV*)data), stash));
+ sv_setsv(ERRSV, sv_2mortal(sv_bless(newRV_noinc((SV*)data), stash)));
Perl_croak(aTHX_ Nullch);
}
Author: joes
Date: Fri Feb 13 23:25:23 2009
New Revision: 744280
URL: http://svn.apache.org/viewvc?rev=744280&view=rev
Log:
these shouldn't be mortal
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744280&r1=744279&r2=744280&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Fri Feb 13 23:25:23 2009
@@ -250,13 +250,13 @@
}
if (obj != Nullsv)
- sv_setsv(*hv_fetch(data, "_r", 2, 1), sv_2mortal(newRV_inc(obj)));
+ sv_setsv(*hv_fetch(data, "_r", 2, 1), newRV_inc(obj));
sv_setiv(*hv_fetch(data, "rc", 2, 1), rc);
sv_setpv(*hv_fetch(data, "file", 4, 1), CopFILE(PL_curcop));
sv_setiv(*hv_fetch(data, "line", 4, 1), CopLINE(PL_curcop));
sv_setpv(*hv_fetch(data, "func", 4, 1), func);
- sv_setsv(ERRSV, sv_2mortal(sv_bless(newRV_noinc((SV*)data), stash)));
+ sv_setsv(ERRSV, sv_bless(newRV_noinc((SV*)data), stash));
Perl_croak(aTHX_ Nullch);
}
Author: joes
Date: Fri Feb 13 23:09:55 2009
New Revision: 744278
URL: http://svn.apache.org/viewvc?rev=744278&view=rev
Log:
get rid of sv leak
Modified:
httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
Modified: httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h?rev=744278&r1=744277&r2=744278&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h (original)
+++ httpd/apreq/trunk/glue/perl/xsbuilder/apreq_xs_postperl.h Fri Feb 13 23:09:55 2009
@@ -242,9 +242,9 @@
{
HV *stash;
- stash = gv_stashpv(ERROR_CLASS, FALSE);
+ stash = gv_stashpv(class, FALSE);
if (stash == NULL) {
- SV *pkg_name = newSVpv(class, 0);
+ SV *pkg_name = sv_2mortal(newSVpv(class, 0));
Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, pkg_name, Nullsv);
stash = gv_stashpv(class, TRUE);
}
Author: joes
Date: Fri Feb 13 22:42:20 2009
New Revision: 744270
URL: http://svn.apache.org/viewvc?rev=744270&view=rev
Log:
add full wordpress header in question
Modified:
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=744270&r1=744269&r2=744270&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Fri Feb 13 22:42:20 2009
@@ -30,8 +30,13 @@
static const char rfccookies[] = "$Version=1; first=a;$domain=quux;second=be,"
"$Version=1;third=cie";
-static const char wpcookies[] = "dbx-postmeta=grabit=0-,1-,2-,3-,4-,5-,6-"
- "&advancedstuff=0-,1+,2-";
+static const char wpcookies[] = "wordpressuser_c580712eb86cad2660b3601ac"
+ "04202b2=admin; wordpresspass_c580712eb8"
+ "6cad2660b3601ac04202b2=7ebeeed42ef50720"
+ "940f5b8db2f9db49; rs_session=59ae9b8b50"
+ "3e3af7d17b97e7f77f7ea5; dbx-postmeta=gr"
+ "abit=0-,1-,2-,3-,4-,5-,6-&advancedstuff"
+ "=0-,1+,2-";
static apr_table_t *jar, *jar2, *jar3;
static apr_pool_t *p;
Author: joes
Date: Fri Feb 13 22:32:16 2009
New Revision: 744267
URL: http://svn.apache.org/viewvc?rev=744267&view=rev
Log:
add wordpress cookie test
Modified:
httpd/apreq/trunk/library/t/cookie.c
Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/t/cookie.c?rev=744267&r1=744266&r2=744267&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Fri Feb 13 22:32:16 2009
@@ -30,7 +30,10 @@
static const char rfccookies[] = "$Version=1; first=a;$domain=quux;second=be,"
"$Version=1;third=cie";
-static apr_table_t *jar, *jar2;
+static const char wpcookies[] = "dbx-postmeta=grabit=0-,1-,2-,3-,4-,5-,6-"
+ "&advancedstuff=0-,1+,2-";
+
+static apr_table_t *jar, *jar2, *jar3;
static apr_pool_t *p;
static void jar_make(dAT)
@@ -41,6 +44,9 @@
jar2 = apr_table_make(p, APREQ_DEFAULT_NELTS);
AT_not_null(jar2);
AT_int_eq(apreq_parse_cookie_header(p, jar2, rfccookies), APR_SUCCESS);
+ jar3 = apr_table_make(p, APREQ_DEFAULT_NELTS);
+ AT_not_null(jar3);
+ AT_int_eq(apreq_parse_cookie_header(p, jar3, wpcookies), APREQ_ERROR_NOTOKEN);
}
static void jar_get_rfc(dAT)
@@ -167,7 +173,7 @@
unsigned i, plan = 0;
dAT;
at_test_t test_list [] = {
- { dT(jar_make, 4) },
+ { dT(jar_make, 6) },
{ dT(jar_get_rfc, 6), "1 3 5" },
{ dT(jar_get_ns, 10) },
{ dT(netscape_cookie, 7) },
Author: joes
Date: Tue Jan 20 18:58:55 2009
New Revision: 736198
URL: http://svn.apache.org/viewvc?rev=736198&view=rev
Log:
fix the solaris bug correctly, damnit!
Modified:
httpd/apreq/trunk/apreq2-config.in
Modified: httpd/apreq/trunk/apreq2-config.in
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/apreq2-config.in?rev=736198&r1=736197&r2=736198&view=diff
==============================================================================
--- httpd/apreq/trunk/apreq2-config.in (original)
+++ httpd/apreq/trunk/apreq2-config.in Tue Jan 20 18:58:55 2009
@@ -215,10 +215,10 @@
done
if test -n "$flags"; then
- if [ -n "$SOLARIS" ]; then
- $flags=`echo $flags | sed -e 's/-L\([^ ]*\)/-R\1 -L\1/g'`
- fi
- echo "$flags"
+ if test -n "$SOLARIS"; then
+ flags=`echo $flags | sed -e 's/-L\([^ ]*\)/-R\1 -L\1/g'`
+ fi
+ echo "$flags"
fi
exit 0
Author: issac
Date: Tue Jan 20 01:12:06 2009
New Revision: 735973
URL: http://svn.apache.org/viewvc?rev=735973&view=rev
Log:
Started release for 2.11
Modified:
httpd/apreq/branches/v2_11/CHANGES
httpd/apreq/branches/v2_11/STATUS
httpd/apreq/branches/v2_11/include/apreq_version.h
Modified: httpd/apreq/branches/v2_11/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_11/CHANGES?rev=735973&r1=735972&r2=735973&view=diff
==============================================================================
--- httpd/apreq/branches/v2_11/CHANGES (original)
+++ httpd/apreq/branches/v2_11/CHANGES Tue Jan 20 01:12:06 2009
@@ -1,7 +1,7 @@
/** @page apreq_changes CHANGES
//! brief List of major changes.
-@section v2_11 Changes with libapreq2-2.11 (in development)
+@section v2_11 Changes with libapreq2-2.11 (released Jan 20, 2009)
- Interactive CGI module [issac]
Allow cgi module to interactively prompt for parameters and cookies when
Modified: httpd/apreq/branches/v2_11/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_11/STATUS?rev=735973&r1=735972&r2=735973&view=diff
==============================================================================
--- httpd/apreq/branches/v2_11/STATUS (original)
+++ httpd/apreq/branches/v2_11/STATUS Tue Jan 20 01:12:06 2009
@@ -1,6 +1,6 @@
/** @page apreq_status STATUS
- 2.11 under developement
+ 2.11 released on Jan 20, 2009
Contributors looking for a mission:
Modified: httpd/apreq/branches/v2_11/include/apreq_version.h
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_11/include/apreq_version.h?rev=735973&r1=735972&r2=735973&view=diff
==============================================================================
--- httpd/apreq/branches/v2_11/include/apreq_version.h (original)
+++ httpd/apreq/branches/v2_11/include/apreq_version.h Tue Jan 20 01:12:06 2009
@@ -68,7 +68,7 @@
* This symbol is defined for internal, "development" copies of libapreq.
* This symbol will be \#undef'd for releases.
*/
-#define APREQ_IS_DEV_VERSION
+#undef APREQ_IS_DEV_VERSION
/** The formatted string of libapreq's version */
Author: issac
Date: Tue Jan 20 01:09:26 2009
New Revision: 735972
URL: http://svn.apache.org/viewvc?rev=735972&view=rev
Log:
Release branch for 2.11
Added:
httpd/apreq/branches/v2_11/
- copied from r735969, httpd/apreq/trunk/
Modified:
httpd/apreq/branches/v2_11/build/RELEASE
Modified: httpd/apreq/branches/v2_11/build/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/v2_11/build/RELEASE?rev=735972&r1=735969&r2=735972&view=diff
==============================================================================
--- httpd/apreq/branches/v2_11/build/RELEASE (original)
+++ httpd/apreq/branches/v2_11/build/RELEASE Tue Jan 20 01:09:26 2009
@@ -5,7 +5,7 @@
1. Create a realease branch:
svn cp https://svn.apache.org/repos/asf/httpd/apreq/trunk \
- https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09
+ https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_11
2. On the BRANCH
@@ -13,13 +13,13 @@
/** @page STATUS
- 2.09 released on <today's date>.
+ 2.11 released on <today's date>.
Also add the release date to the top @section in CHANGES:
/** @page CHANGES
- @section v2_09 Changes with libapreq2-2.09 (released ...).
+ @section v2_11 Changes with libapreq2-2.11 (released ...).
And #undef the APREQ_VERSION_IS_DEV macro definition
in include/apreq_version.h:
@@ -28,21 +28,21 @@
*/
#undef APREQ_IS_DEV_VERSION
- % svn commit -m "2.09 release started" STATUS CHANGES include/apreq_version.h
+ % svn commit -m "2.11 release started" STATUS CHANGES include/apreq_version.h
3. On TRUNK:
Update CHANGES and STATUS to reflect the start of a new develoment cycle,
and run this to update the package version numbers throughout the tree:
- % build/update_version.pl 2.10
+ % build/update_version.pl 2.12
- % svn commit -m "2.10 cycle"
+ % svn commit -m "2.12 cycle"
4. Prep the package for CPAN by running:
% make release
- This will generate a libapreq2-2.09.tar.gz candidate in the
+ This will generate a libapreq2-2.11.tar.gz candidate in the
current directory. You should keep this source tree
intact to tag the final release.
@@ -55,11 +55,11 @@
6. Sign it via gpg:
- % gpg --detach-sign --armor libapreq2-2.09.tar.gz
+ % gpg --detach-sign --armor libapreq2-2.11.tar.gz
or pgp:
- % pgp -sba libapreq2-2.09.tar.gz
+ % pgp -sba libapreq2-2.11.tar.gz
7. Upload the release candidate to people.apache.org/~username
and post a candidate announcement to apreq-dev@. Also, it is
@@ -67,7 +67,7 @@
announcement to the modperl@ list, to solicit feedback
from a much larger audience.
- Subject: [RELEASE CANDIDATE] libapreq2 2.10 RC\d+
+ Subject: [RELEASE CANDIDATE] libapreq2 2.12 RC\d+
8. Give the mailing list participants 48-72 hours to comment and
vote on the candidate. If there is a "majority consensus"
@@ -77,19 +77,19 @@
9. Tag the Release -- from the BRANCH
- svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_09 \
- https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_09
+ svn mv https://svn.apache.org/repos/asf/httpd/apreq/branches/v2_11 \
+ https://svn.apache.org/repos/asf/httpd/apreq/tags/v2_11
10. Upload (scp) the package and signature to www.apache.org
for distribution:
- % scp libapreq2-2.09.tar.gz* \
+ % scp libapreq2-2.11.tar.gz* \
$USER@people.apache.org:/www/www.apache.org/dist/httpd/libapreq/
Ask another developer to confirm the uploaded signature is ok.
- % gpg --verify libapreq2-2.09.tar.gz.asc
- % pgp libapreq2-2.09.tar.gz.asc
+ % gpg --verify libapreq2-2.11.tar.gz.asc
+ % pgp libapreq2-2.11.tar.gz.asc
Check that your public key is among those listed in the
/www/www.apache.org/dist/httpd/KEYS file. If not, you
Author: issac
Date: Tue Jan 20 01:07:53 2009
New Revision: 735971
URL: http://svn.apache.org/viewvc?rev=735971&view=rev
Log:
Yeah, yeah - branched from inside /build/ re-start
Removed:
httpd/apreq/branches/v2_11/
Author: issac
Date: Tue Jan 20 01:06:59 2009
New Revision: 735970
URL: http://svn.apache.org/viewvc?rev=735970&view=rev
Log:
Release branch for 2.11
Added:
httpd/apreq/branches/v2_11/
- copied from r735969, httpd/apreq/trunk/build/
Author: joes
Date: Tue Jan 13 17:16:34 2009
New Revision: 734294
URL: http://svn.apache.org/viewvc?rev=734294&view=rev
Log:
add note about how to install the
doxygen documentation for libapreq2
Modified:
httpd/apreq/trunk/INSTALL
Modified: httpd/apreq/trunk/INSTALL
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/INSTALL?rev=734294&r1=734293&r2=734294&view=diff
==============================================================================
--- httpd/apreq/trunk/INSTALL (original)
+++ httpd/apreq/trunk/INSTALL Tue Jan 13 17:16:34 2009
@@ -16,7 +16,7 @@
% make
(optional)% make test
% make install
-
+ (optional)% make docs_install
Or using the CPAN/perlish way (which includes the Apache2::Request and
Apache2::Cookie modules):
@@ -25,6 +25,7 @@
% make
(optional)% make test
% make install
+ (optional)% make docs_install
Developers and other folks using httpd-apreq-2 directly from svn need to
execute "./buildconf" prior to running "./configure".
Author: joes
Date: Tue Jan 13 16:57:49 2009
New Revision: 734289
URL: http://svn.apache.org/viewvc?rev=734289&view=rev
Log:
tweaks to release docs for 1.x
Modified:
httpd/apreq/branches/1.x/RELEASE
Modified: httpd/apreq/branches/1.x/RELEASE
URL: http://svn.apache.org/viewvc/httpd/apreq/branches/1.x/RELEASE?rev=734289&r1=734288&r2=734289&view=diff
==============================================================================
--- httpd/apreq/branches/1.x/RELEASE (original)
+++ httpd/apreq/branches/1.x/RELEASE Tue Jan 13 16:57:49 2009
@@ -27,7 +27,7 @@
% perl Makefile.PL
% make dist
- This will generate a libapreq-1.xx.tar.gz candidate in the
+ This will generate a libapreq-1.xx.tar.gz candidate in the
current directory.
4. Test the generated file's './configure ...' build and
@@ -53,7 +53,7 @@
% scp libapreq-1.35.tar.gz* username@people.apache.org:~/public_html
- Ask another developer to confirm the uploaded signature is ok
+ Ask another developer to confirm the uploaded signature is ok
---------------------------------------------------
Subject: please verify sig of libapreq-1.35.tar.gz
@@ -88,12 +88,12 @@
8. Give the mailing list participants 48-72 hours to vote on the release.
Tally the results after 72 hours of the call. If there is a
- "majority consensus" (three +1 and more +1s than -1s) among the
+ "majority consensus" (three +1 and more +1's than -1's) among the
httpd PMC members, the RM may proceed with the release. Otherwise
- the RM must abandon this release and start fresh.
+ the RM must abandon this release and start fresh.
- If any -1s are received, the release is rejected. Edit the ./STATUS file
- and modify the line
+ If more -1's than +1's are received, or less than 3 +1's are received,
+ the release is rejected. Edit the ./STATUS file and modify the line
1.35 : Released <Date>
@@ -105,9 +105,10 @@
version and commit your changes. Then start a release with the new version
number by starting again from step 1.
-9. If 3 +1 votes are received by members of the httpd PMC, the release is a go.
- Copy the package and signature to the www.apache.org website
- for distribution:
+9. If 3 +1 votes are received by members of the httpd PMC and there are more
+ +1's than -1's after at least a 72 hour window has elapsed (majority
+ consensus), the release is a go. Copy the package and signature to the
+ www.apache.org website for distribution:
people% mv public_html/libapreq-1.35.tar.gz* \
/www/www.apache.org/dist/httpd/libapreq/
@@ -117,7 +118,7 @@
Wait 24 hours to allow ASF and CPAN mirrors to propogate the release.
-10. Update the httpd-areq homepage to list the new release in
+10. Update the httpd-apreq homepage to list the new release in
the News section. For instructions on updating the httpd website,
see httpd-apreq-2/build/WEBSITE.
Author: joes
Date: Tue Jan 13 16:49:48 2009
New Revision: 734286
URL: http://svn.apache.org/viewvc?rev=734286&view=rev
Log:
minor tweaks
Modified:
httpd/apreq/trunk/library/module_cgi.c
Modified: httpd/apreq/trunk/library/module_cgi.c
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/library/module_cgi.c?rev=734286&r1=734285&r2=734286&view=diff
==============================================================================
--- httpd/apreq/trunk/library/module_cgi.c (original)
+++ httpd/apreq/trunk/library/module_cgi.c Tue Jan 13 16:49:48 2009
@@ -77,7 +77,7 @@
};
#define CRLF "\015\012"
-const char *nullstr = 0;
+static const char *nullstr = 0;
#define DEFAULT_PROMPT "([$t] )$n(\\($l\\))([$d]): "
#define MAX_PROMPT_NESTING_LEVELS 8
#define MAX_BUFFER_SIZE 65536
@@ -549,7 +549,7 @@
int i = 1;
apr_file_printf(req->sout, "[CGI] Requested all argument parameters\n");
while (1) {
- apr_file_printf(req->sout, "[CGI] Please enter a name for parameter %d (or
jusr hit ENTER to end): ",
+ apr_file_printf(req->sout, "[CGI] Please enter a name for parameter %d (or
just hit ENTER to end): ",
i++);
apr_file_gets(buf, 65536, req->sin);
chomp(buf);
Author: joes
Date: Tue Jan 13 16:01:10 2009
New Revision: 734278
URL: http://svn.apache.org/viewvc?rev=734278&view=rev
Log:
bump version
Modified:
httpd/apreq/trunk/STATUS
Modified: httpd/apreq/trunk/STATUS
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/STATUS?rev=734278&r1=734277&r2=734278&view=diff
==============================================================================
--- httpd/apreq/trunk/STATUS (original)
+++ httpd/apreq/trunk/STATUS Tue Jan 13 16:01:10 2009
@@ -1,6 +1,6 @@
/** @page apreq_status STATUS
- 2.10 under developement
+ 2.11 under developement
Contributors looking for a mission: