joes 2004/06/14 21:18:28
Modified: . CHANGES RELEASE acinclude.m4
build announcement.pl
src Makefile.am apreq.c apreq_parsers.c apreq_version.h
Log:
Eliminate APR_ADDTO macro, eliminate tempnam() dependency via
apr_temp_dir_get, and enable gcc warnings when in maintainer-mode.
Revision Changes Path
1.39 +8 -0 httpd-apreq-2/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-apreq-2/CHANGES,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- CHANGES 14 Jun 2004 02:19:58 -0000 1.38
+++ CHANGES 15 Jun 2004 04:18:27 -0000 1.39
@@ -1,7 +1,14 @@
/** @page CHANGES
+
@section v2_04_dev Changes with libapreq2-2.04-dev
+
+- C API [joes]
+ Replace free/tempnam dependency in apreq_file_mktemp() with
+ apr_temp_dir_get(). Add additional gcc warning flags when
+ --enable-maintainer-mode is set.
+
- C API [joes, Scott Hutton]
Replace apreq_brigade_copy with more effective APREQ_BRIGADE_COPY
macro. Also introduce APREQ_BRIGADE_SETASIDE to deal with buckets
@@ -14,6 +21,7 @@
@section v2_03_dev Changes with libapreq2-2.03-dev (released June 12, 2004)
+
- C API [joes]
"Objectify" cookie/jar API:
s/apreq_(make|serialize)_cookie/apreq_cookie_$1/
1.10 +3 -2 httpd-apreq-2/RELEASE
Index: RELEASE
===================================================================
RCS file: /home/cvs/httpd-apreq-2/RELEASE,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RELEASE 14 Jun 2004 19:16:00 -0000 1.9
+++ RELEASE 15 Jun 2004 04:18:27 -0000 1.10
@@ -91,10 +91,11 @@
9. Wait ~12-24 hours for the ASF mirrors to pick up the new package, then
update the apreq homepage to list the new release in the News section
Be sure to update the libapreq2 documentation. For instructions on
updating
- the httpd website, see build/WEBSITE.
+ the httpd website, see build/WEBSITE. IMPORTANT: YOU MUST UPDATE
+ download.html TO POINT AT THE NEW RELEASE PACKAGE!
10. Mail the announcement from your cvs.apache.org account by piping the
"CPAN Upload" email acknowledgement (from PAUSE) through
build/announcement.pl:
- % build/announcement.pl < CPAN_ack | ssh [EMAIL PROTECTED] "sendmail
-oi -t -odq"
+ % build/announcement.pl < CPAN_ack | ssh [EMAIL PROTECTED] "sendmail -oi
-t -odq"
1.20 +3 -25 httpd-apreq-2/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- acinclude.m4 10 Jun 2004 20:51:33 -0000 1.19
+++ acinclude.m4 15 Jun 2004 04:18:27 -0000 1.20
@@ -103,9 +103,9 @@
USE_VPATH=1
fi
- dnl AC_SUBST(top_builddir)
- dnl AC_SUBST(abs_srcdir)
- dnl AC_SUBST(abs_builddir)
+ if test -n "$USE_MAINTAINER_MODE"; then
+ CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes
-Wstrict-prototypes -Wmissing-declarations -Werror"
+ fi
get_version="$abs_srcdir/build/get-version.sh"
version_hdr="$abs_srcdir/src/apreq_version.h"
@@ -145,28 +145,6 @@
AC_SUBST(APR_LA)
AC_SUBST(APU_LA)
AC_SUBST(PERL)
-])
-
-AC_DEFUN([APR_ADDTO],[
- if test "x$$1" = "x"; then
- echo " setting $1 to \"$2\""
- $1="$2"
- else
- apr_addto_bugger="$2"
- for i in $apr_addto_bugger; do
- apr_addto_duplicate="0"
- for j in $$1; do
- if test "x$i" = "x$j"; then
- apr_addto_duplicate="1"
- break
- fi
- done
- if test $apr_addto_duplicate = "0"; then
- echo " adding \"$i\" to $1"
- $1="$$1 $i"
- fi
- done
- fi
])
dnl Iteratively interpolate the contents of the second argument
1.3 +5 -3 httpd-apreq-2/build/announcement.pl
Index: announcement.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/announcement.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- announcement.pl 14 Jun 2004 19:22:40 -0000 1.2
+++ announcement.pl 15 Jun 2004 04:18:27 -0000 1.3
@@ -1,6 +1,7 @@
#! /usr/bin/perl
use warnings;
use strict;
+
our($PACKAGE_NAME, $PACKAGE_TITLE, $PACKAGE_VERSION, $LIBRARY_VERSION);
foreach (qw/PACKAGE_TITLE PACKAGE_NAME PACKAGE_VERSION LIBRARY_VERSION/) {
no strict 'refs';
@@ -18,10 +19,10 @@
my $MAIL_FROM = '<' . (split /[:@]/, slurp "CVS/Root")[2] . '@apache.org>';
my $RCPT_TO = join ",\n ", map "<$_>" ,
qw(
- [email protected]
+ [email protected]
[EMAIL PROTECTED]
- [email protected]
- [email protected]
+ [email protected]
+ [email protected]
);
my ($LICENSE_VERSION) = grep s/^\s+Version (\d\.\d),.*$/$1/, slurp "LICENSE";
@@ -57,6 +58,7 @@
my $changes = (split /[EMAIL PROTECTED]/, slurp "CHANGES")[1];
+
print <<EOM;
$mail_header
1.17 +1 -0 httpd-apreq-2/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.am 24 Mar 2004 08:22:48 -0000 1.16
+++ Makefile.am 15 Jun 2004 04:18:27 -0000 1.17
@@ -10,6 +10,7 @@
pkgincludedir = $(includedir)/@APREQ_LIBNAME@
+
if BUILD_APR
@APR_LA@:
1.35 +5 -5 httpd-apreq-2/src/apreq.c
Index: apreq.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apreq.c 14 Jun 2004 02:19:58 -0000 1.34
+++ apreq.c 15 Jun 2004 04:18:27 -0000 1.35
@@ -689,11 +689,11 @@
return rc;
}
else {
- char *tn = tempnam(NULL, "apreq");
- if (tn == NULL)
- return APR_EGENERAL;
- tmpl = apr_pstrcat(pool, tn, "XXXXXX", NULL);
- free(tn);
+ const char *tdir;
+ rc = apr_temp_dir_get(&tdir, pool);
+ if (rc != APR_SUCCESS)
+ return rc;
+ tmpl = apr_pstrcat(pool, tdir, "XXXXXX", NULL);
}
return apr_file_mktemp(fp, tmpl,
1.47 +0 -5 httpd-apreq-2/src/apreq_parsers.c
Index: apreq_parsers.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_parsers.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apreq_parsers.c 14 Jun 2004 02:19:58 -0000 1.46
+++ apreq_parsers.c 15 Jun 2004 04:18:27 -0000 1.47
@@ -698,11 +698,9 @@
{
apr_bucket *last = APR_BRIGADE_LAST(out);
apr_status_t s;
- struct iovec v[APREQ_NELTS];
apr_bucket_file *f;
apr_bucket *e;
apr_off_t wlen;
- int n = 0;
if (APR_BUCKET_IS_EOS(last))
return APR_EOF;
@@ -764,10 +762,8 @@
{
apr_pool_t *pool = apreq_env_pool(env);
struct mfd_ctx *ctx = parser->ctx;
- apr_off_t off;
apr_status_t s;
-
if (parser->ctx == NULL) {
char *ct;
apr_size_t blen;
@@ -814,7 +810,6 @@
case MFD_INIT:
{
- apr_bucket *e = APR_BRIGADE_LAST(ctx->bb);
s = split_on_bdry(ctx->bb, bb, NULL, ctx->bdry + 2);
if (s != APR_SUCCESS) {
APREQ_BRIGADE_SETASIDE(bb, pool);
1.12 +1 -1 httpd-apreq-2/src/apreq_version.h
Index: apreq_version.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_version.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apreq_version.h 14 Jun 2004 02:45:16 -0000 1.11
+++ apreq_version.h 15 Jun 2004 04:18:27 -0000 1.12
@@ -60,7 +60,7 @@
#define APREQ_MINOR_VERSION 0
/** patch level */
-#define APREQ_PATCH_VERSION 8
+#define APREQ_PATCH_VERSION 9
/**
* This symbol is defined for internal, "development" copies of libapreq.
