httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r234120 [2/2] - in /httpd/apreq/trunk: glue/perl/lib/Apache2/ glue/perl/t/apreq/ glue/perl/t/response/TestApReq/ glue/perl/xsbuilder/ glue/perl/xsbuilder/APR/Request/ glue/perl/xsbuilder/APR/Request/CGI/ glue/perl/xsbuilder/APR/Request/Cook...
Date Sat, 20 Aug 2005 19:51:07 GMT
Modified: httpd/apreq/trunk/include/groups.dox.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/include/groups.dox.in?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/include/groups.dox.in (original)
+++ httpd/apreq/trunk/include/groups.dox.in Sat Aug 20 12:50:35 2005
@@ -5,7 +5,7 @@
  * @verbinclude README
  */
 
-/** 
+/**
  * @defgroup libapreq2 Apache Request Library
  * @brief libapreq2 Version @APREQ_DOTTED_VERSION@
  *
@@ -14,7 +14,7 @@
  * @see http://apr.apache.org/
  *
  * @section apreq2_config Configuring libapreq2 Applications
- * This package includes <code>apreq2-config</code>, 
+ * This package includes <code>apreq2-config</code>,
  * a configuration script for building applications
  * with libapreq2.  Run <code>apreq2-config --help</code>
  * to display its options. XXX add examples here XXX
@@ -34,18 +34,18 @@
  * XXX
  */
 
-/** 
- * @page apreq_license LICENSE 
+/**
+ * @page apreq_license LICENSE
  * @verbinclude LICENSE
  */
 
-/** 
+/**
  * @page apreq_notice NOTICE
  * @verbinclude NOTICE
  */
 
-/** 
- * @page apreq_install INSTALL 
+/**
+ * @page apreq_install INSTALL
  * @verbinclude INSTALL
  */
 
@@ -53,7 +53,7 @@
  * @defgroup apreq_xs Perl
  * @brief XS Modules
  * @ingroup apreq_lang
-@manonly 
+@manonly
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIapreq_xs_request\fR\|(3), \fIapreq_xs_upload\fR\|(3), \fIapreq_xs_cookie\fR\|(3)

Modified: httpd/apreq/trunk/library/cookie.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/cookie.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/cookie.c (original)
+++ httpd/apreq/trunk/library/cookie.c Sat Aug 20 12:50:35 2005
@@ -27,7 +27,7 @@
 
 #define ADD_COOKIE(j,c) apreq_value_table_add(&c->v, j)
 
-APREQ_DECLARE(void) apreq_cookie_expires(apreq_cookie_t *c, 
+APREQ_DECLARE(void) apreq_cookie_expires(apreq_cookie_t *c,
                                          const char *time_str)
 {
     if (time_str == NULL) {
@@ -47,7 +47,7 @@
 }
 
 static apr_status_t apreq_cookie_attr(apr_pool_t *p,
-                                      apreq_cookie_t *c, 
+                                      apreq_cookie_t *c,
                                       const char *attr,
                                       apr_size_t alen,
                                       const char *val,
@@ -104,7 +104,7 @@
         if (!strncasecmp("commentURL", attr, 10)) {
             c->commentURL = apr_pstrmemdup(p,val,vlen);
             return APR_SUCCESS;
-        } 
+        }
         else if (!strncasecmp("comment", attr, 7)) {
             c->comment = apr_pstrmemdup(p,val,vlen);
             return APR_SUCCESS;
@@ -123,7 +123,7 @@
     return APR_ENOTIMPL;
 }
 
-APREQ_DECLARE(apreq_cookie_t *) apreq_cookie_make(apr_pool_t *p, 
+APREQ_DECLARE(apreq_cookie_t *) apreq_cookie_make(apr_pool_t *p,
                                                   const char *name,
                                                   const apr_size_t nlen,
                                                   const char *value,
@@ -155,7 +155,7 @@
     c->comment = NULL;
     c->commentURL = NULL;
     c->max_age = -1;    /* session cookie is the default */
-    c->flags = 0; 
+    c->flags = 0;
 
 
     return c;
@@ -180,7 +180,7 @@
 
     val = key + 1;
 
-    do --key; 
+    do --key;
     while (key > hdr && apr_isspace(*key));
 
     *n = key;
@@ -219,7 +219,7 @@
                     *vlen = d - dest;
                     *v = dest;
                 }
-                
+
                 return APR_SUCCESS;
             case '\\':
                 saw_backslash = 1;
@@ -369,8 +369,8 @@
                                           char *buf, apr_size_t len)
 {
     /*  The format string must be large enough to accomodate all
-     *  of the cookie attributes.  The current attributes sum to 
-     *  ~90 characters (w/ 6-8 padding chars per attr), so anything 
+     *  of the cookie attributes.  The current attributes sum to
+     *  ~90 characters (w/ 6-8 padding chars per attr), so anything
      *  over 100 should be fine.
      */
 
@@ -382,7 +382,7 @@
 
     if (c->v.name == NULL)
         return -1;
-    
+
 #define NULL2EMPTY(attr) (attr ? attr : "")
 
 
@@ -449,8 +449,8 @@
         strcpy(f, "; secure");
 
     return apr_snprintf(buf, len, format, c->v.name, c->v.data, version,
-                        NULL2EMPTY(c->path), NULL2EMPTY(c->domain), 
-                        NULL2EMPTY(c->port), NULL2EMPTY(c->comment), 
+                        NULL2EMPTY(c->path), NULL2EMPTY(c->domain),
+                        NULL2EMPTY(c->port), NULL2EMPTY(c->comment),
                         NULL2EMPTY(c->commentURL), apr_time_sec(c->max_age));
 }
 

Modified: httpd/apreq/trunk/library/module_cgi.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/module_cgi.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/module_cgi.c (original)
+++ httpd/apreq/trunk/library/module_cgi.c Sat Aug 20 12:50:35 2005
@@ -69,7 +69,7 @@
     const char *t_name;
     int      t_val;
 } TRANS;
- 
+
 static const TRANS priorities[] = {
     {"emerg",   CGILOG_EMERG},
     {"alert",   CGILOG_ALERT},
@@ -81,7 +81,7 @@
     {"debug",   CGILOG_DEBUG},
     {NULL,      -1},
 };
- 
+
 static const char *cgi_header_in(apreq_handle_t *handle,
                                  const char *name)
 {
@@ -194,7 +194,7 @@
             req->body_status = APREQ_ERROR_OVERLIMIT;
             cgi_log_error(CGILOG_MARK, CGILOG_ERR, req->body_status, handle,
                           "Content-Length header (%s) exceeds configured "
-                          "max_body limit (%" APR_UINT64_T_FMT ")", 
+                          "max_body limit (%" APR_UINT64_T_FMT ")",
                           cl_header, req->read_limit);
             return;
         }
@@ -209,7 +209,7 @@
             if (pf != NULL) {
                 req->parser = apreq_parser_make(pool,
                                                 ba,
-                                                ct_header, 
+                                                ct_header,
                                                 pf,
                                                 req->brigade_limit,
                                                 req->temp_dir,
@@ -239,7 +239,7 @@
     req->in         = apr_brigade_create(pool, ba);
     req->tmpbb      = apr_brigade_create(pool, ba);
 
-    apr_file_open_stdin(&file, pool); // error status?    
+    apr_file_open_stdin(&file, pool); // error status?
     pipe = apr_bucket_pipe_create(file, ba);
     eos = apr_bucket_eos_create(ba);
     APR_BRIGADE_INSERT_HEAD(req->in, pipe);
@@ -303,7 +303,7 @@
                           "Bytes read (%" APR_UINT64_T_FMT
                           ") exceeds configured limit (%" APR_UINT64_T_FMT ")",
                           req->bytes_read, req->read_limit);
-            
+
             break;
         }
 
@@ -330,7 +330,7 @@
         const char *cookies = cgi_header_in(handle, "Cookie");
         if (cookies != NULL) {
             req->jar = apr_table_make(handle->pool, APREQ_DEFAULT_NELTS);
-            req->jar_status = 
+            req->jar_status =
                 apreq_parse_cookie_header(handle->pool, req->jar, cookies);
         }
         else
@@ -350,7 +350,7 @@
         const char *qs = cgi_query_string(handle);
         if (qs != NULL) {
             req->args = apr_table_make(handle->pool, APREQ_DEFAULT_NELTS);
-            req->args_status = 
+            req->args_status =
                 apreq_parse_query_string(handle->pool, req->args, qs);
         }
         else
@@ -432,7 +432,7 @@
     return req->body_status;
 }
 
-static apreq_param_t *cgi_body_get(apreq_handle_t *handle, 
+static apreq_param_t *cgi_body_get(apreq_handle_t *handle,
                                    const char *name)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
@@ -463,12 +463,12 @@
         if (val != NULL)
             return apreq_value_to_param(val);
 
-        /* Not seen yet, so we need to scan for 
+        /* Not seen yet, so we need to scan for
            param while prefetching the body */
 
         if (req->find_param == NULL)
-            req->find_param = apreq_hook_make(handle->pool, 
-                                              apreq_hook_find_param, 
+            req->find_param = apreq_hook_make(handle->pool,
+                                              apreq_hook_find_param,
                                               NULL, NULL);
         h = req->find_param;
         h->next = req->parser->hook;
@@ -502,7 +502,7 @@
     return NULL;
 }
 
-static apr_status_t cgi_parser_get(apreq_handle_t *handle, 
+static apr_status_t cgi_parser_get(apreq_handle_t *handle,
                                    const apreq_parser_t **parser)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
@@ -511,7 +511,7 @@
     return APR_SUCCESS;
 }
 
-static apr_status_t cgi_parser_set(apreq_handle_t *handle, 
+static apr_status_t cgi_parser_set(apreq_handle_t *handle,
                                    apreq_parser_t *parser)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
@@ -564,8 +564,8 @@
                                           apr_size_t bytes)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
-    apr_size_t *limit = (req->parser == NULL) 
-                      ? &req->brigade_limit 
+    apr_size_t *limit = (req->parser == NULL)
+                      ? &req->brigade_limit
                       : &req->parser->brigade_limit;
 
     if (*limit > bytes) {
@@ -580,8 +580,8 @@
                                           apr_size_t *bytes)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
-    *bytes = (req->parser == NULL) 
-           ?  req->brigade_limit 
+    *bytes = (req->parser == NULL)
+           ?  req->brigade_limit
            :  req->parser->brigade_limit;
 
     return APR_SUCCESS;
@@ -614,7 +614,7 @@
                                      const char *path)
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
-    const char **temp_dir = (req->parser == NULL) 
+    const char **temp_dir = (req->parser == NULL)
                           ? &req->temp_dir
                           : &req->parser->temp_dir;
 
@@ -634,7 +634,7 @@
 {
     struct cgi_handle *req = (struct cgi_handle *)handle;
     *path = (req->parser == NULL)
-           ? req->temp_dir 
+           ? req->temp_dir
            : req->parser->temp_dir;
     return APR_SUCCESS;
 }
@@ -657,7 +657,7 @@
     apr_bucket_alloc_t *ba;
     struct cgi_handle *req;
     void *data;
-    
+
     apr_pool_userdata_get(&data, USER_DATA_KEY, pool);
 
     if (data != NULL)
@@ -674,8 +674,8 @@
     req->read_limit           = (apr_uint64_t) -1;
     req->brigade_limit        = APREQ_DEFAULT_BRIGADE_LIMIT;
 
-    req->args_status = 
-        req->jar_status = 
+    req->args_status =
+        req->jar_status =
             req->body_status = APR_EINIT;
 
     apr_pool_userdata_setn(&req->handle, USER_DATA_KEY, NULL, pool);

Modified: httpd/apreq/trunk/library/module_custom.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/module_custom.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/module_custom.c (original)
+++ httpd/apreq/trunk/library/module_custom.c Sat Aug 20 12:50:35 2005
@@ -39,7 +39,7 @@
 
 
 static apr_status_t custom_parse_brigade(apreq_handle_t *handle, apr_uint64_t bytes)
-{       
+{
     struct custom_handle *req = (struct custom_handle *)handle;
     apr_status_t s;
     apr_bucket *e;
@@ -59,7 +59,7 @@
             break;
         }
 
-        req->body_status = 
+        req->body_status =
             apreq_parser_run(req->parser, req->body, req->tmpbb);
 
         apr_brigade_cleanup(req->tmpbb);
@@ -78,7 +78,7 @@
             req->body_status = APREQ_ERROR_OVERLIMIT;
             break;
         }
-        req->body_status = 
+        req->body_status =
             apreq_parser_run(req->parser, req->body, req->tmpbb);
 
         apr_brigade_cleanup(req->tmpbb);
@@ -273,7 +273,7 @@
 
     if (cookie != NULL) {
         req->jar = apr_table_make(pool, APREQ_DEFAULT_NELTS);
-        req->jar_status = 
+        req->jar_status =
             apreq_parse_cookie_header(pool, req->jar, cookie);
     }
     else {
@@ -284,7 +284,7 @@
 
     if (query_string != NULL) {
         req->args = apr_table_make(pool, APREQ_DEFAULT_NELTS);
-        req->args_status = 
+        req->args_status =
             apreq_parse_query_string(pool, req->args, query_string);
     }
     else {

Modified: httpd/apreq/trunk/library/param.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/param.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/param.c (original)
+++ httpd/apreq/trunk/library/param.c Sat Aug 20 12:50:35 2005
@@ -25,9 +25,9 @@
 #define MAX_READ_AHEAD  (1024 * 64)
 
 
-APREQ_DECLARE(apreq_param_t *) apreq_param_make(apr_pool_t *p, 
+APREQ_DECLARE(apreq_param_t *) apreq_param_make(apr_pool_t *p,
                                                 const char *name,
-                                                const apr_size_t nlen, 
+                                                const apr_size_t nlen,
                                                 const char *val,
                                                 const apr_size_t vlen)
 {
@@ -41,7 +41,7 @@
 
     param->info = NULL;
     param->upload = NULL;
-    param->flags = 0; 
+    param->flags = 0;
 
     *(const apreq_value_t **)&v = &param->v;
 
@@ -154,7 +154,7 @@
             break;
 
         case '&':
-        case ';': 
+        case ';':
         case 0:
             if (qs > start) {
                 apr_size_t vlen = 0;
@@ -190,7 +190,7 @@
 static int param_push(void *data, const char *key, const char *val)
 {
     apr_array_header_t *arr = data;
-    *(apreq_param_t **)apr_array_push(arr) = 
+    *(apreq_param_t **)apr_array_push(arr) =
         apreq_value_to_param(val);
     return 1;   /* keep going */
 }

Modified: httpd/apreq/trunk/library/parser.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/parser.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser.c (original)
+++ httpd/apreq/trunk/library/parser.c Sat Aug 20 12:50:35 2005
@@ -66,7 +66,7 @@
 
 
 /*XXX this may need to check the parser's state before modifying the hook list */
-APREQ_DECLARE(apr_status_t) apreq_parser_add_hook(apreq_parser_t *p, 
+APREQ_DECLARE(apr_status_t) apreq_parser_add_hook(apreq_parser_t *p,
                                                   apreq_hook_t *h)
 {
     apreq_hook_t *last = h;
@@ -224,7 +224,7 @@
     if (ctx == NULL) {
         parser->ctx = ctx = apr_palloc(pool, sizeof *ctx);
         ctx->status = GEN_INCOMPLETE;
-        ctx->param = apreq_param_make(pool, 
+        ctx->param = apreq_param_make(pool,
                                       "_dummy_", strlen("_dummy_"), "", 0);
         ctx->param->upload = apr_brigade_create(pool, parser->bucket_alloc);
         ctx->param->info = apr_table_make(pool, APREQ_DEFAULT_NELTS);

Modified: httpd/apreq/trunk/library/parser_header.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/parser_header.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser_header.c (original)
+++ httpd/apreq/trunk/library/parser_header.c Sat Aug 20 12:50:35 2005
@@ -31,10 +31,10 @@
 struct hdr_ctx {
     apr_bucket_brigade *bb;
    enum {
-       HDR_NAME, 
-       HDR_GAP, 
-       HDR_VALUE, 
-       HDR_NEWLINE, 
+       HDR_NAME,
+       HDR_GAP,
+       HDR_VALUE,
+       HDR_NEWLINE,
        HDR_CONTINUE,
        HDR_COMPLETE,
        HDR_ERROR
@@ -45,9 +45,9 @@
 
 
 static apr_status_t split_header_line(apreq_param_t **p,
-                                      apr_pool_t *pool, 
+                                      apr_pool_t *pool,
                                       apr_bucket_brigade *bb,
-                                      apr_size_t nlen, 
+                                      apr_size_t nlen,
                                       apr_size_t glen,
                                       apr_size_t vlen)
 {
@@ -64,7 +64,7 @@
     if (nlen == 0)
         return APR_EBADARG;
 
-    param = apreq_param_make(pool, NULL, nlen, NULL, vlen - 1); /*drop (CR)LF */ 
+    param = apreq_param_make(pool, NULL, nlen, NULL, vlen - 1); /*drop (CR)LF */
     *(const apreq_value_t **)&v = &param->v;
 
     arr.pool     = pool;
@@ -77,7 +77,7 @@
 
     /* store name in a temporary iovec array */
 
-    while (nlen > 0) {        
+    while (nlen > 0) {
         apr_size_t len;
         end = apr_array_push(&arr);
         s = apr_bucket_read(e, (const char **)&end->iov_base,
@@ -131,7 +131,7 @@
     /* write name */
     v->name = dest;
     iov = (struct iovec *)arr.elts;
-    
+
     while (iov <= end) {
         memcpy(dest, iov->iov_base, iov->iov_len);
         dest += iov->iov_len;
@@ -172,7 +172,7 @@
 
     ctx->status = HDR_NAME;
 
-    /* parse the brigade for CRLF_CRLF-terminated header block, 
+    /* parse the brigade for CRLF_CRLF-terminated header block,
      * each time starting from the front of the brigade.
      */
 
@@ -291,7 +291,7 @@
 
         case HDR_NEWLINE:
 
-            if (off == dlen) 
+            if (off == dlen)
                 break;
             else {
                 switch (data[off]) {

Modified: httpd/apreq/trunk/library/parser_multipart.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/parser_multipart.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser_multipart.c (original)
+++ httpd/apreq/trunk/library/parser_multipart.c Sat Aug 20 12:50:35 2005
@@ -46,15 +46,15 @@
     const apr_strmatch_pattern  *pattern;
     char                        *bdry;
     enum {
-        MFD_INIT,  
-        MFD_NEXTLINE, 
+        MFD_INIT,
+        MFD_NEXTLINE,
         MFD_HEADER,
         MFD_POST_HEADER,
-        MFD_PARAM, 
+        MFD_PARAM,
         MFD_UPLOAD,
         MFD_MIXED,
         MFD_COMPLETE,
-        MFD_ERROR 
+        MFD_ERROR
     }                            status;
     apr_bucket                  *eos;
     const char                  *param_name;
@@ -182,7 +182,7 @@
         else
             idx = apreq_index(buf, len, bdry, blen, APREQ_MATCH_PARTIAL);
 
-        /* Theoretically idx should never be 0 here, because we 
+        /* Theoretically idx should never be 0 here, because we
          * already tested the front of the brigade for a potential match.
          * However, it doesn't hurt to allow for the possibility,
          * since this will just start the whole loop over again.
@@ -211,7 +211,7 @@
     apr_size_t blen;
     struct mfd_ctx *ctx = apr_palloc(pool, sizeof *ctx);
     char *ct = apr_pstrdup(pool, content_type);
- 
+
     ct = strchr(ct, ';');
     if (ct == NULL)
         return NULL; /* missing semicolon */
@@ -256,7 +256,7 @@
 
     if (ctx == NULL) {
         ctx = create_multipart_context(parser->content_type,
-                                       pool, ba, 
+                                       pool, ba,
                                        parser->brigade_limit,
                                        parser->temp_dir);
         if (ctx == NULL)
@@ -341,10 +341,10 @@
              *    body-part = MIME-part-header [CRLF *OCTET]
              *
              *  So the CRLF we already matched in MFD_HEADER may have been
-             *  part of the boundary string! Both Konqueror (v??) and 
+             *  part of the boundary string! Both Konqueror (v??) and
              *  Mozilla-0.97 are known to emit such blocks.
              *
-             *  Here we first check for this condition with 
+             *  Here we first check for this condition with
              *  brigade_start_string, and prefix the brigade with
              *  an additional CRLF bucket if necessary.
              */
@@ -392,7 +392,7 @@
                     s = apreq_header_attribute(cd, "name", 4,
                                                &name, &nlen);
                     if (s == APR_SUCCESS) {
-                        next_ctx->param_name 
+                        next_ctx->param_name
                             = apr_pstrmemdup(pool, name, nlen);
                     }
                     else {
@@ -404,7 +404,7 @@
 
                 }
 
-                ctx->next_parser = apreq_parser_make(pool, ba, ct, 
+                ctx->next_parser = apreq_parser_make(pool, ba, ct,
                                                      apreq_parse_multipart,
                                                      parser->brigade_limit,
                                                      parser->temp_dir,
@@ -424,12 +424,12 @@
                     goto mfd_parse_brigade;
                 }
 
-                s = apreq_header_attribute(cd, "filename", 
+                s = apreq_header_attribute(cd, "filename",
                                            8, &filename, &flen);
                 if (s == APR_SUCCESS) {
                     apreq_param_t *param;
 
-                    param = apreq_param_make(pool, name, nlen, 
+                    param = apreq_param_make(pool, name, nlen,
                                              filename, flen);
                     apreq_param_tainted_on(param);
                     param->info = ctx->info;
@@ -450,7 +450,7 @@
             else if (cd != NULL && strncmp(cd, "file", 4) == 0) {
                 apreq_param_t *param;
 
-                s = apreq_header_attribute(cd, "filename", 
+                s = apreq_header_attribute(cd, "filename",
                                            8, &filename, &flen);
                 if (s != APR_SUCCESS || ctx->param_name == NULL) {
                     ctx->status = MFD_ERROR;
@@ -458,7 +458,7 @@
                 }
                 name = ctx->param_name;
                 nlen = strlen(name);
-                param = apreq_param_make(pool, name, nlen, 
+                param = apreq_param_make(pool, name, nlen,
                                          filename, flen);
                 apreq_param_tainted_on(param);
                 param->info = ctx->info;
@@ -485,11 +485,11 @@
 
                 filename = "";
                 flen = 0;
-                param = apreq_param_make(pool, name, nlen, 
+                param = apreq_param_make(pool, name, nlen,
                                          filename, flen);
                 apreq_param_tainted_on(param);
                 param->info = ctx->info;
-                param->upload = apr_brigade_create(pool, 
+                param->upload = apr_brigade_create(pool,
                                                ctx->bb->bucket_alloc);
                 ctx->upload = param;
                 ctx->status = MFD_UPLOAD;
@@ -504,7 +504,7 @@
             apreq_value_t *v;
             apr_size_t len;
             apr_off_t off;
-            
+
             s = split_on_bdry(ctx->bb, ctx->in, ctx->pattern, ctx->bdry);
 
             switch (s) {
@@ -521,7 +521,7 @@
                     return s;
                 }
                 len = off;
-                param = apreq_param_make(pool, ctx->param_name, 
+                param = apreq_param_make(pool, ctx->param_name,
                                          strlen(ctx->param_name),
                                          NULL, len);
                 apreq_param_tainted_on(param);
@@ -572,7 +572,7 @@
                 apreq_brigade_setaside(ctx->bb, pool);
                 apreq_brigade_setaside(ctx->in, pool);
                 s = apreq_brigade_concat(pool, parser->temp_dir,
-                                         parser->brigade_limit, 
+                                         parser->brigade_limit,
                                          param->upload, ctx->bb);
                 return (s == APR_SUCCESS) ? APR_INCOMPLETE : s;
 

Modified: httpd/apreq/trunk/library/parser_urlencoded.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/parser_urlencoded.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/parser_urlencoded.c (original)
+++ httpd/apreq/trunk/library/parser_urlencoded.c Sat Aug 20 12:50:35 2005
@@ -33,7 +33,7 @@
 struct url_ctx {
     apr_bucket_brigade *bb;
     enum {
-        URL_NAME, 
+        URL_NAME,
         URL_VALUE,
         URL_COMPLETE,
         URL_ERROR

Modified: httpd/apreq/trunk/library/t/at.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/at.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/at.c (original)
+++ httpd/apreq/trunk/library/t/at.c Sat Aug 20 12:50:35 2005
@@ -36,11 +36,11 @@
     if (t->current < t->plan)
         return at_report(t, "Bail out!");
     else
-        return at_report(t, "END"); 
+        return at_report(t, "END");
 }
 
 void at_end(at_t *t)
-{     
+{
     apr_pool_cleanup_kill(t->pool, t, test_cleanup);
     test_cleanup(t);
 }
@@ -90,7 +90,7 @@
     }
 
     return s;
-} 
+}
 
 void at_ok(at_t *t, int is_ok, const char *label, const char *file, int line)
 {
@@ -102,7 +102,7 @@
     int rv, is_fatal = 0, is_skip = 0, is_todo = 0;
 
     t->current++;
-      
+
     if (*t->fatal == t->current) {
         t->fatal++;
         is_fatal = 1;
@@ -127,7 +127,7 @@
     else
         comment = is_todo ? "todo" : is_skip ? "skip" : "at";
 
-    rv = apr_snprintf(buf, 256, fmt, t->current + t->prior, 
+    rv = apr_snprintf(buf, 256, fmt, t->current + t->prior,
                       label, comment,  file, line, t->current, t->name);
 
     if (rv <= 0)
@@ -262,7 +262,7 @@
     if (*q->saved_fatal == AT->current + 1)
         q->saved_fatal++;
 
-    apr_pool_cleanup_register(p, q, report_local_cleanup, 
+    apr_pool_cleanup_register(p, q, report_local_cleanup,
                                     report_local_cleanup);
 }
 

Modified: httpd/apreq/trunk/library/t/at.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/at.h?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/at.h (original)
+++ httpd/apreq/trunk/library/t/at.h Sat Aug 20 12:50:35 2005
@@ -48,10 +48,10 @@
 };
 
 /* We only need one at_t struct per test suite, so lets call it *AT.
- * The mnemonic we follow is that (for lowercase foo) "AT_foo(bar)" 
+ * The mnemonic we follow is that (for lowercase foo) "AT_foo(bar)"
  * should be syntactically equivalent to "at_foo(AT, bar)".
  *
- * Terminology: test == an at_test_t, 
+ * Terminology: test == an at_test_t,
  *              check == an assertion which produces TAP.
  */
 
@@ -74,7 +74,7 @@
 
 
 static APR_INLINE
-apr_status_t at_report(at_t *t, const char *msg) { 
+apr_status_t at_report(at_t *t, const char *msg) {
     at_report_t *r = t->report;
     return r->func(r, msg);
 }
@@ -114,7 +114,7 @@
 
 
 
-/* Additional reporting utils. 
+/* Additional reporting utils.
    These emit TAP comments, and are not "checks". */
 
 apr_status_t at_comment(at_t *t, const char *fmt, va_list vp);
@@ -233,7 +233,7 @@
 #define AT_not_null(a) AT_ptr_ne(a, NULL)
 
 
-/* XXX these two macro checks evaluate a & b more than once, but the 
+/* XXX these two macro checks evaluate a & b more than once, but the
  * upshot is that they don't care too much about their types.
  */
 
@@ -248,7 +248,7 @@
     char buf[256];
     while (n-- > 0) {
         ++t->current;
-        apr_snprintf(buf, 256, "ok %d - %s (%d) #skipped: %s (%s:%d)", 
+        apr_snprintf(buf, 256, "ok %d - %s (%d) #skipped: %s (%s:%d)",
                      t->current + t->prior, t->name, t->current, reason, file, line);
         at_report(t, buf);
     }

Modified: httpd/apreq/trunk/library/t/cookie.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/cookie.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/cookie.c (original)
+++ httpd/apreq/trunk/library/t/cookie.c Sat Aug 20 12:50:35 2005
@@ -93,7 +93,7 @@
     AT_str_eq(apreq_cookie_as_string(c, p), "foo=bar; domain=example.com");
 
     c->path = apr_pstrdup(p, "/quux");
-    AT_str_eq(apreq_cookie_as_string(c, p), 
+    AT_str_eq(apreq_cookie_as_string(c, p),
               "foo=bar; path=/quux; domain=example.com");
 
     apreq_cookie_expires(c, "+1y");
@@ -101,7 +101,7 @@
                              + apr_time_from_sec(apreq_atoi64t("+1y")));
     expires[7] = '-';
     expires[11] = '-';
-    val = apr_pstrcat(p, "foo=bar; path=/quux; domain=example.com; expires=", 
+    val = apr_pstrcat(p, "foo=bar; path=/quux; domain=example.com; expires=",
                       expires, NULL);
 
     AT_str_eq(apreq_cookie_as_string(c, p), val);
@@ -112,7 +112,7 @@
 {
     apreq_cookie_t *c = apreq_cookie_make(p,"rfc",3,"out",3);
     const char *expected;
-    long expires; 
+    long expires;
 
     AT_str_eq(c->v.data, "out");
 
@@ -178,7 +178,7 @@
 
     apr_pool_create(&p, NULL);
 
-    AT = at_create(p, 0, at_report_stdout_make(p)); 
+    AT = at_create(p, 0, at_report_stdout_make(p));
 
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/t/error.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/error.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/error.c (original)
+++ httpd/apreq/trunk/library/t/error.c Sat Aug 20 12:50:35 2005
@@ -76,7 +76,7 @@
 
     apr_pool_create(&p, NULL);
 
-    AT = at_create(p, 0, at_report_stdout_make(p)); 
+    AT = at_create(p, 0, at_report_stdout_make(p));
 
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/t/params.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/params.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/params.c (original)
+++ httpd/apreq/trunk/library/t/params.c Sat Aug 20 12:50:35 2005
@@ -93,7 +93,7 @@
     s3 = apreq_escape(p, s2, 11);
     AT_str_eq(s3,"dandy+%3Edons");
     apreq_unescape(s3);
-    AT_str_eq(s3,"dandy >dons"); 
+    AT_str_eq(s3,"dandy >dons");
 }
 
 static void header_attributes(dAT)
@@ -145,7 +145,7 @@
     char *encode;
     strcpy(name, "foo");
     strcpy(val, "bar > alpha");
- 
+
     param = apreq_param_make(p, name, nlen, val, vlen);
     AT_str_eq(param->v.name, name);
     AT_int_eq(param->v.dlen, vlen);
@@ -169,7 +169,7 @@
     const char *expr;
     int i;
     const char * arr[] = {"cest", "\"cest", "ce\"st", "\"cest\""};
-    const char * arr_quote[] = 
+    const char * arr_quote[] =
         {"\"cest\"", "\"\\\"cest\"", "\"ce\\\"st\"", "\"\\\"cest\\\"\""};
     apr_size_t arr_len[] = {4, 5, 5, 6};
     apr_size_t arr_quote_len[] = {6, 8, 8, 10};
@@ -211,7 +211,7 @@
 
     apreq_initialize(p);
 
-    AT = at_create(p, 0, at_report_stdout_make(p)); 
+    AT = at_create(p, 0, at_report_stdout_make(p));
     AT_trace_on();
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/t/parsers.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/parsers.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/parsers.c (original)
+++ httpd/apreq/trunk/library/t/parsers.c Sat Aug 20 12:50:35 2005
@@ -26,7 +26,7 @@
 
 static char url_data[] = "alpha=one&beta=two;omega=last%2";
 
-static char form_data[] = 
+static char form_data[] =
 "--AaB03x" CRLF                                           /* 10 chars
  012345678901234567890123456789012345678901234567890123456789 */
 "content-disposition: form-data; name=\"field1\"" CRLF    /* 47 chars */
@@ -150,14 +150,14 @@
                                100, NULL, NULL, NULL);
 
     APR_BRIGADE_INSERT_HEAD(bb,
-        apr_bucket_immortal_create(url_data,strlen(url_data), 
+        apr_bucket_immortal_create(url_data,strlen(url_data),
                                    bb->bucket_alloc));
 
     rv = apreq_parser_run(parser, body, bb);
     AT_int_eq(rv, APR_INCOMPLETE);
 
     APR_BRIGADE_INSERT_HEAD(bb,
-        apr_bucket_immortal_create("blast",5, 
+        apr_bucket_immortal_create("blast",5,
                                    bb->bucket_alloc));
     APR_BRIGADE_INSERT_TAIL(bb,
            apr_bucket_eos_create(bb->bucket_alloc));
@@ -316,7 +316,7 @@
 
     body = apr_table_make(p, APREQ_DEFAULT_NELTS);
 
-    parser = apreq_parser_make(p, ba, "application/xml", 
+    parser = apreq_parser_make(p, ba, "application/xml",
                                apreq_parse_generic, 1000, NULL, NULL, NULL);
 
     rv = apreq_parser_run(parser, body, bb);
@@ -348,7 +348,7 @@
     body = apr_table_make(p, APREQ_DEFAULT_NELTS);
 
     hook = apreq_hook_make(p, apreq_hook_discard_brigade, NULL, NULL);
-    parser = apreq_parser_make(p, ba, "application/xml", 
+    parser = apreq_parser_make(p, ba, "application/xml",
                                apreq_parse_generic, 1000, NULL, hook, NULL);
 
 
@@ -388,7 +388,7 @@
     xml_hook = apreq_hook_make(p, apreq_hook_apr_xml_parser, NULL, NULL);
 
     body =   apr_table_make(p, APREQ_DEFAULT_NELTS);
-    parser = apreq_parser_make(p, ba, ct, apreq_parse_multipart, 
+    parser = apreq_parser_make(p, ba, ct, apreq_parse_multipart,
                                1000, NULL, xml_hook, NULL);
 
     rv = apreq_parser_run(parser, body, bb);
@@ -460,7 +460,7 @@
     APR_BRIGADE_INSERT_HEAD(bb, e);
     APR_BRIGADE_INSERT_TAIL(bb, apr_bucket_eos_create(bb->bucket_alloc));
 
-    parser = apreq_parser_make(p, ba, ct, apreq_parse_multipart, 
+    parser = apreq_parser_make(p, ba, ct, apreq_parse_multipart,
                                1000, NULL, NULL, NULL);
 
     rv = apreq_parser_run(parser, body, bb);
@@ -506,7 +506,7 @@
     apr_pool_t *test_pool;
     unsigned i, plan = 0;
     dAT;
-    at_test_t test_list [] = {        
+    at_test_t test_list [] = {
         dT(locate_default_parsers, 3),
         dT(parse_urlencoded, 5),
         dT(parse_multipart, sizeof form_data),
@@ -525,7 +525,7 @@
     apreq_initialize(p);
 
 
-    AT = at_create(test_pool, 0, at_report_stdout_make(test_pool)); 
+    AT = at_create(test_pool, 0, at_report_stdout_make(test_pool));
 
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/t/util.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/util.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/util.c (original)
+++ httpd/apreq/trunk/library/t/util.c Sat Aug 20 12:50:35 2005
@@ -29,7 +29,7 @@
     AT_int_eq(apreq_atoi64f("3.333"), 3);
     AT_int_eq(apreq_atoi64f("33k"), 33 * 1024);
     AT_int_eq(apreq_atoi64f(" +8M "), 8 * 1024 * 1024);
-    AT_ok(apreq_atoi64f("44GB") == (apr_int64_t)44 * 1024 * 1024 * 1024, 
+    AT_ok(apreq_atoi64f("44GB") == (apr_int64_t)44 * 1024 * 1024 * 1024,
           "44GB test");
     AT_ok(apreq_atoi64f("0xaBcDefg") == (apr_int64_t)11259375 * 1024 * 1024 * 1024,
           "hex test");
@@ -76,7 +76,7 @@
     char src1[] = "%C3%80%E3%82%a2"; /* A_GRAVE KATAKANA_A as utf8 */
     unsigned char expect[6];
 
-    AT_int_eq(apreq_decode((char *)expect, &elen, src1, sizeof(src1) -1), 
+    AT_int_eq(apreq_decode((char *)expect, &elen, src1, sizeof(src1) -1),
               APR_SUCCESS + APREQ_CHARSET_UTF8);
     AT_int_eq(elen, 5);
     AT_int_eq(expect[0], 0xC3);
@@ -130,7 +130,7 @@
     unsigned char expect[16];
     apr_size_t slen;
 
-    AT_int_eq(apreq_decode((char *)src2, &slen, src1, sizeof(src1) -1), 
+    AT_int_eq(apreq_decode((char *)src2, &slen, src1, sizeof(src1) -1),
               APR_SUCCESS + APREQ_CHARSET_UTF8);
     AT_int_eq(apreq_cp1252_to_utf8((char *)expect, src2, 5),
               12);
@@ -143,7 +143,7 @@
     AT_int_eq(expect[2], 0xE0 | (0x20AC >> 12));
     AT_int_eq(expect[3], 0x80 | ((0x20AC >> 6) & 0x3F));
     AT_int_eq(expect[4], 0x80 | (0x20AC & 0x3F));
-    
+
     /* 0xE3 */
     AT_int_eq(expect[5], 0xC3);
     AT_int_eq(expect[6], 0xE3 - 0x40);
@@ -152,7 +152,7 @@
     AT_int_eq(expect[7], 0xE0 | (0x201A >> 12));
     AT_int_eq(expect[8], 0x80 | ((0x201A >> 6) & 0x3F));
     AT_int_eq(expect[9], 0x80 | (0x201A & 0x3F));
-    
+
 
     /* 0xA2 */
     AT_int_eq(expect[10], 0xC0 | (0xA2 >> 6));
@@ -297,7 +297,7 @@
 
     apr_pool_create(&p, NULL);
 
-    AT = at_create(p, 0, at_report_stdout_make(p)); 
+    AT = at_create(p, 0, at_report_stdout_make(p));
 
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/t/version.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/t/version.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/t/version.c (original)
+++ httpd/apreq/trunk/library/t/version.c Sat Aug 20 12:50:35 2005
@@ -52,7 +52,7 @@
 
     apr_pool_create(&p, NULL);
 
-    AT = at_create(p, 0, at_report_stdout_make(p)); 
+    AT = at_create(p, 0, at_report_stdout_make(p));
 
     for (i = 0; i < sizeof(test_list) / sizeof(at_test_t);  ++i)
         plan += test_list[i].plan;

Modified: httpd/apreq/trunk/library/util.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/util.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/library/util.c (original)
+++ httpd/apreq/trunk/library/util.c Sat Aug 20 12:50:35 2005
@@ -57,7 +57,7 @@
 
 /* converts date offsets (e.g. "+3M") to seconds */
 
-APREQ_DECLARE(apr_int64_t) apreq_atoi64t(const char *s) 
+APREQ_DECLARE(apr_int64_t) apreq_atoi64t(const char *s)
 {
     apr_int64_t n = 0;
     char *p;
@@ -88,8 +88,8 @@
 }
 
 
-APREQ_DECLARE(apr_ssize_t ) apreq_index(const char* hay, apr_size_t hlen, 
-                                        const char* ndl, apr_size_t nlen, 
+APREQ_DECLARE(apr_ssize_t ) apreq_index(const char* hay, apr_size_t hlen,
+                                        const char* ndl, apr_size_t nlen,
                                         const apreq_match_t type)
 {
     apr_size_t len = hlen;
@@ -135,9 +135,9 @@
 }
 
 
-/* Unicode notes: "bmp" refers to the 16-bit 
- * Unicode Basic Multilingual Plane. Here we're 
- * restricting our unicode internals to 16-bit 
+/* Unicode notes: "bmp" refers to the 16-bit
+ * Unicode Basic Multilingual Plane. Here we're
+ * restricting our unicode internals to 16-bit
  * codepoints, to keep the code as simple as possible.
  * This should be sufficient for apreq itself, since
  * we really only need to validate RFC3986-encoded utf8.
@@ -197,7 +197,7 @@
 
     while (s < end) {
         c = cp1252_to_bmp(*s++);
-        
+
         if (c < 0x80) {
             *d++ = c;
         }
@@ -220,7 +220,7 @@
  * Valid utf8 bit patterns:
  *
  * 0xxxxxxx
- * 110xxxxx 10xxxxxx 
+ * 110xxxxx 10xxxxxx
  * 1110xxxx 10xxxxxx 10xxxxxx
  * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
  * 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
@@ -500,7 +500,7 @@
                 }
 	    }
             else if (s + 5 < end && (s[1] == 'u' || s[1] == 'U') &&
-                     apr_isxdigit(s[2]) && apr_isxdigit(s[3]) && 
+                     apr_isxdigit(s[2]) && apr_isxdigit(s[3]) &&
                      apr_isxdigit(s[4]) && apr_isxdigit(s[5]))
             {
                 apr_uint16_t c = hex4_to_bmp(s+2);
@@ -536,7 +536,7 @@
 	    else {
                 *dlen = d - start;
                 *slen = s - src;
-                if (s + 5 < end 
+                if (s + 5 < end
                     || (s + 2 < end && !apr_isxdigit(s[2]))
                     || (s + 1 < end && !apr_isxdigit(s[1])
                         && s[1] != 'u' && s[1] != 'U'))
@@ -657,8 +657,8 @@
 }
 
 
-APREQ_DECLARE(apr_size_t) apreq_encode(char *dest, const char *src, 
-                                       const apr_size_t slen) 
+APREQ_DECLARE(apr_size_t) apreq_encode(char *dest, const char *src,
+                                       const apr_size_t slen)
 {
     char *d = dest;
     const unsigned char *s = (const unsigned char *)src;
@@ -706,11 +706,11 @@
     return 0;
 }
 
-APREQ_DECLARE(apr_size_t) apreq_quote_once(char *dest, const char *src, 
-                                           const apr_size_t slen) 
+APREQ_DECLARE(apr_size_t) apreq_quote_once(char *dest, const char *src,
+                                           const apr_size_t slen)
 {
     if (is_quoted(src, slen)) {
-        /* looks like src is already quoted */        
+        /* looks like src is already quoted */
         memcpy(dest, src, slen);
         dest[slen] = 0;
         return slen;
@@ -719,8 +719,8 @@
         return apreq_quote(dest, src, slen);
 }
 
-APREQ_DECLARE(apr_size_t) apreq_quote(char *dest, const char *src, 
-                                      const apr_size_t slen) 
+APREQ_DECLARE(apr_size_t) apreq_quote(char *dest, const char *src,
+                                      const apr_size_t slen)
 {
     char *d = dest;
     const char *s = src;
@@ -741,7 +741,7 @@
             s++;
             break;
 
-        case '\\': 
+        case '\\':
         case '"':
             *d++ = '\\';
 
@@ -756,8 +756,8 @@
     return d - dest;
 }
 
-APREQ_DECLARE(char *) apreq_join(apr_pool_t *p, 
-                                 const char *sep, 
+APREQ_DECLARE(char *) apreq_join(apr_pool_t *p,
+                                 const char *sep,
                                  const apr_array_header_t *arr,
                                  apreq_join_t mode)
 {
@@ -856,7 +856,7 @@
 }
 
 APR_INLINE
-static apr_status_t apreq_fwritev(apr_file_t *f, struct iovec *v, 
+static apr_status_t apreq_fwritev(apr_file_t *f, struct iovec *v,
                                   int *nelts, apr_size_t *bytes_written)
 {
     apr_size_t len;
@@ -906,7 +906,7 @@
 }
 
 
-APREQ_DECLARE(apr_status_t) apreq_brigade_fwrite(apr_file_t *f, 
+APREQ_DECLARE(apr_status_t) apreq_brigade_fwrite(apr_file_t *f,
                                                  apr_off_t *wlen,
                                                  apr_bucket_brigade *bb)
 {
@@ -917,7 +917,7 @@
     *wlen = 0;
 
     for (e = APR_BRIGADE_FIRST(bb); e != APR_BRIGADE_SENTINEL(bb);
-         e = APR_BUCKET_NEXT(e)) 
+         e = APR_BUCKET_NEXT(e))
     {
         apr_size_t len;
         if (n == APREQ_DEFAULT_NELTS) {
@@ -926,7 +926,7 @@
                 return s;
             *wlen += len;
         }
-        s = apr_bucket_read(e, (const char **)&(v[n].iov_base), 
+        s = apr_bucket_read(e, (const char **)&(v[n].iov_base),
                             &len, APR_BLOCK_READ);
         if (s != APR_SUCCESS)
             return s;
@@ -959,15 +959,15 @@
 /*
  * The reason we need the above cleanup is because on Windows, APR_DELONCLOSE
  * forces applications to open the file with FILE_SHARED_DELETE
- * set, which is, unfortunately, a property that is preserved 
- * across NTFS "hard" links.  This breaks apps that link() the temp 
- * file to a permanent location, and subsequently expect to open it 
+ * set, which is, unfortunately, a property that is preserved
+ * across NTFS "hard" links.  This breaks apps that link() the temp
+ * file to a permanent location, and subsequently expect to open it
  * before the original tempfile is closed+deleted. In fact, even
  * Apache::Upload does this, so it is a common enough event that the
  * apreq_file_cleanup workaround is necessary.
  */
 
-APREQ_DECLARE(apr_status_t) apreq_file_mktemp(apr_file_t **fp, 
+APREQ_DECLARE(apr_status_t) apreq_file_mktemp(apr_file_t **fp,
                                               apr_pool_t *pool,
                                               const char *path)
 {
@@ -985,11 +985,11 @@
 
     if (rc != APR_SUCCESS)
         return rc;
-    
+
     data = apr_palloc(pool, sizeof *data);
-    /* cleanups are LIFO, so this one will run just after 
+    /* cleanups are LIFO, so this one will run just after
        the cleanup set by mktemp */
-    apr_pool_cleanup_register(pool, data, 
+    apr_pool_cleanup_register(pool, data,
                               apreq_file_cleanup, apreq_file_cleanup);
 
     rc = apr_file_mktemp(fp, tmpl, /* NO APR_DELONCLOSE! see comment above */
@@ -1011,7 +1011,7 @@
 /*
  * is_2616_token() is the verbatim definition from section 2.2
  * in the rfc itself.  We try to optimize it around the
- * expectation that the argument is not a token, which 
+ * expectation that the argument is not a token, which
  * should be the typical usage.
  */
 
@@ -1077,7 +1077,7 @@
             }
         }
         else {
-            *val = v; 
+            *val = v;
 
         look_for_terminator:
             switch (*v) {
@@ -1169,7 +1169,7 @@
 APREQ_DECLARE(apr_status_t) apreq_brigade_concat(apr_pool_t *pool,
                                                  const char *temp_dir,
                                                  apr_size_t heap_limit,
-                                                 apr_bucket_brigade *out, 
+                                                 apr_bucket_brigade *out,
                                                  apr_bucket_brigade *in)
 {
     apr_status_t s;
@@ -1201,7 +1201,7 @@
             return APR_SUCCESS;
         }
     }
-    
+
     if (!BUCKET_IS_SPOOL(last_out)) {
 
         s = apreq_file_mktemp(&file, pool, temp_dir);
@@ -1213,7 +1213,7 @@
         if (s != APR_SUCCESS)
             return s;
 
-        last_out = apr_bucket_file_create(file, wlen, 0, 
+        last_out = apr_bucket_file_create(file, wlen, 0,
                                           out->p, out->bucket_alloc);
         last_out->type = &spool_bucket_type;
         APR_BRIGADE_INSERT_TAIL(out, last_out);
@@ -1221,8 +1221,8 @@
     }
     else {
         f = last_out->data;
-        /* Need to seek here, just in case our spool bucket 
-         * was read from between apreq_brigade_concat calls. 
+        /* Need to seek here, just in case our spool bucket
+         * was read from between apreq_brigade_concat calls.
          */
         wlen = last_out->start + last_out->length;
         s = apr_file_seek(f->fd, APR_SET, &wlen);
@@ -1242,7 +1242,7 @@
 
     if (s == APR_SUCCESS) {
 
-        /* We have to deal with the possibility that the new 
+        /* We have to deal with the possibility that the new
          * data may be too large to be represented by a single
          * temp_file bucket.
          */

Modified: httpd/apreq/trunk/module/apache/command.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache/command.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache/command.c (original)
+++ httpd/apreq/trunk/module/apache/command.c Sat Aug 20 12:50:35 2005
@@ -32,9 +32,9 @@
  * <TABLE class="qref"><CAPTION>Per-directory commands for mod_apreq</CAPTION>
  * <TR><TH>Directive</TH><TH>Context</TH><TH>Default</TH><TH>Description</TH></TR>
  * <TR class="odd"><TD>APREQ_ReadLimit</TD><TD>directory</TD><TD>-1 (Unlimited)</TD><TD>
- * Maximum number of bytes mod_apreq will send off to libapreq for parsing.  
+ * Maximum number of bytes mod_apreq will send off to libapreq for parsing.
  * mod_apreq will log this event and remove itself from the filter chain.
- * The APREQ_ERROR_GENERAL error will be reported to libapreq2 users via the return 
+ * The APREQ_ERROR_GENERAL error will be reported to libapreq2 users via the return
  * value of apreq_env_read().
  * </TD></TR>
  * <TR><TD>APREQ_BrigadeLimit</TD><TD>directory</TD><TD> #APREQ_MAX_BRIGADE_LEN </TD><TD>
@@ -153,8 +153,8 @@
     apr_initialize();
     apr_pool_create(&p, NULL);
     apreq_initialize(p);
-    ap_add_version_component(p, apr_psprintf(p, 
-                                             "mod_apreq-%d/%s", 
+    ap_add_version_component(p, apr_psprintf(p,
+                                             "mod_apreq-%d/%s",
                                              APREQ_APACHE_MMN,
                                              apreq_version_string()));
     ap_register_cleanup(sp, p, apreq_cleanup, apreq_cleanup);

Modified: httpd/apreq/trunk/module/apache/handle.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache/handle.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache/handle.c (original)
+++ httpd/apreq/trunk/module/apache/handle.c Sat Aug 20 12:50:35 2005
@@ -96,7 +96,7 @@
             req->body_status = APREQ_ERROR_OVERLIMIT;
             ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                           "Content-Length header (%s) exceeds configured "
-                          "max_body limit (%" APR_UINT64_T_FMT ")", 
+                          "max_body limit (%" APR_UINT64_T_FMT ")",
                           cl_header, req->read_limit);
             return;
         }
@@ -111,7 +111,7 @@
             if (pf != NULL) {
                 req->parser = apreq_parser_make(req->pool,
                                                 ba,
-                                                ct_header, 
+                                                ct_header,
                                                 pf,
                                                 req->brigade_limit,
                                                 req->temp_dir,
@@ -211,7 +211,7 @@
         const char *cookies = ap_table_get(r->headers_in, "Cookie");
         if (cookies != NULL) {
             req->jar = apr_table_make(req->pool, APREQ_DEFAULT_NELTS);
-            req->jar_status = 
+            req->jar_status =
                 apreq_parse_cookie_header(req->pool, req->jar, cookies);
         }
         else
@@ -230,7 +230,7 @@
     if (req->args_status == APR_EINIT) {
         if (r->args != NULL) {
             req->args = apr_table_make(req->pool, APREQ_DEFAULT_NELTS);
-            req->args_status = 
+            req->args_status =
                 apreq_parse_query_string(req->pool, req->args, r->args);
         }
         else
@@ -345,7 +345,7 @@
 }
 
 static
-apr_status_t apache_parser_get(apreq_handle_t *env, 
+apr_status_t apache_parser_get(apreq_handle_t *env,
                                   const apreq_parser_t **parser)
 {
     struct apache_handle *req = (struct apache_handle *)env;
@@ -354,7 +354,7 @@
 }
 
 static
-apr_status_t apache_parser_set(apreq_handle_t *env, 
+apr_status_t apache_parser_set(apreq_handle_t *env,
                                 apreq_parser_t *parser)
 {
     struct apache_handle *req = (struct apache_handle *)env;
@@ -408,8 +408,8 @@
                                        apr_size_t bytes)
 {
     struct apache_handle *req = (struct apache_handle *)env;
-    apr_size_t *limit = (req->parser == NULL) 
-                      ? &req->brigade_limit 
+    apr_size_t *limit = (req->parser == NULL)
+                      ? &req->brigade_limit
                       : &req->parser->brigade_limit;
 
     if (*limit > bytes) {
@@ -425,8 +425,8 @@
                                        apr_size_t *bytes)
 {
     struct apache_handle *req = (struct apache_handle *)env;
-    *bytes = (req->parser == NULL) 
-           ?  req->brigade_limit 
+    *bytes = (req->parser == NULL)
+           ?  req->brigade_limit
            :  req->parser->brigade_limit;
 
     return APR_SUCCESS;
@@ -460,7 +460,7 @@
 {
     struct apache_handle *req = (struct apache_handle *)env;
 
-    const char **curpath = (req->parser == NULL) 
+    const char **curpath = (req->parser == NULL)
                          ? &req->temp_dir
                          : &req->parser->temp_dir;
 

Modified: httpd/apreq/trunk/module/apache2/apreq_module_apache2.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/apreq_module_apache2.h?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/apreq_module_apache2.h (original)
+++ httpd/apreq/trunk/module/apache2/apreq_module_apache2.h Sat Aug 20 12:50:35 2005
@@ -33,7 +33,7 @@
  * mod_apreq2 provides the "APREQ2" input filter for using libapreq2
  * (and allow its parsed data structures to be shared) within
  * the Apache 2.X webserver.  Using it, libapreq2 works properly
- * in every phase of the HTTP request, from translation handlers 
+ * in every phase of the HTTP request, from translation handlers
  * to output filters, and even for subrequests / internal redirects.
  *
  * <hr>
@@ -63,25 +63,25 @@
  *
  * However, this is not required because libapreq2 will add the filter (only)
  * if it's necessary.  You just need to ensure that your module invokes
- * apreq_handle_apache2() <em>before the content handler ultimately reads 
+ * apreq_handle_apache2() <em>before the content handler ultimately reads
  * from the input filter chain</em>.  It is important to realize that no
- * matter how the input filters are initially arranged, the APREQ2 filter 
+ * matter how the input filters are initially arranged, the APREQ2 filter
  * will attempt to reposition itself to be the last input filter to read the
  * data.
  *
  * If you want to use other input filters to transform the incoming HTTP
  * request data, is important to register those filters with Apache
- * as having type AP_FTYPE_CONTENT_SET or AP_FTYPE_RESOURCE.  Due to the 
- * limitations of Apache's current input filter design, types higher than 
+ * as having type AP_FTYPE_CONTENT_SET or AP_FTYPE_RESOURCE.  Due to the
+ * limitations of Apache's current input filter design, types higher than
  * AP_FTYPE_CONTENT_SET may not work properly whenever the apreq filter is
  * active.
  *
- * This is especially true when a content handler uses libapreq2 to parse 
+ * This is especially true when a content handler uses libapreq2 to parse
  * some of the post data before doing an internal redirect.  Any input
  * filter subsequently added to the redirected request will bypass the
  * original apreq filter (and therefore lose access to some of the original
  * post data), unless its type is less than the type of the apreq filter
- * (currently AP_FTYPE_PROTOCOL-1). 
+ * (currently AP_FTYPE_PROTOCOL-1).
  *
  *
  * <H2>Server Configuration Directives</H2>
@@ -99,7 +99,7 @@
  *     <TD> #APREQ_DEFAULT_READ_LIMIT </TD>
  *     <TD> Maximum number of bytes mod_apreq2 will send off to libapreq2
  *          for parsing. mod_apreq2 will log this event and subsequently
- *          remove itself from the filter chain. 
+ *          remove itself from the filter chain.
  *     </TD>
  *   </TR>
  *   <TR>
@@ -107,7 +107,7 @@
  *     <TD>directory</TD>
  *     <TD>#APREQ_DEFAULT_BRIGADE_LIMIT</TD>
  *     <TD> Maximum number of bytes mod_apreq2 will let accumulate
- *          within the heap-buckets in a brigade.  Excess data will be 
+ *          within the heap-buckets in a brigade.  Excess data will be
  *          spooled to an appended file bucket.
  *     </TD>
  *   </TR>
@@ -118,7 +118,7 @@
  *     <TD> Sets the location of the temporary directory apreq will use to spool
  *          overflow brigade data (based on the APREQ2_BrigadeLimit setting).
  *          If left unset, libapreq2 will select a platform-specific location
- *          via apr_temp_dir_get(). 
+ *          via apr_temp_dir_get().
  *     </TD>
  *  </TR>
  * </TABLE>

Modified: httpd/apreq/trunk/module/apache2/filter.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/filter.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/filter.c (original)
+++ httpd/apreq/trunk/module/apache2/filter.c Sat Aug 20 12:50:35 2005
@@ -137,7 +137,7 @@
         else if (content_length > ctx->read_limit) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_EGENERAL, r,
                           "Content-Length header (%s) exceeds configured "
-                          "max_body limit (%" APR_UINT64_T_FMT ")", 
+                          "max_body limit (%" APR_UINT64_T_FMT ")",
                           cl_header, ctx->read_limit);
             ctx->body_status = APREQ_ERROR_OVERLIMIT;
             return;
@@ -197,7 +197,7 @@
  *    just needs to ensure cfg->f does not point at it.
  * 3) If req->proto_input_filters and req->input_filters are apreq
  *    filters, and req->input_filters->next == req->proto_input_filters,
- *    it is safe for apreq_filter to "steal" the proto filter's context 
+ *    it is safe for apreq_filter to "steal" the proto filter's context
  *    and subsequently drop it from the chain.
  */
 
@@ -211,7 +211,7 @@
 {
     request_rec *r = f->r;
     struct filter_ctx *ctx = f->ctx;
-    struct apache2_handle *handle = 
+    struct apache2_handle *handle =
         (struct apache2_handle *)apreq_handle_apache2(r);
 
     /* Don't parse GET (this protects against subrequest body parsing). */
@@ -242,7 +242,7 @@
      * if it is, we must deregister it now.
      */
     if (handle->f == f) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
                      "disabling stale protocol filter");
         if (ctx->body_status == APR_INCOMPLETE)
             ctx->body_status = APREQ_ERROR_INTERRUPT;
@@ -273,7 +273,7 @@
                        APR_BLOCK_READ, readbytes);
 
     if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                       "ap_get_brigade failed during prefetch");
         ctx->filter_error = rv;
         return ctx->body_status = APREQ_ERROR_GENERAL;
@@ -291,13 +291,13 @@
         return ctx->body_status = rv;
     }
 
-    /* Adding "f" to the protocol filter chain ensures the 
+    /* Adding "f" to the protocol filter chain ensures the
      * spooled data is preserved across internal redirects.
      */
 
     if (f != r->proto_input_filters) {
         ap_filter_t *in;
-        for (in = r->input_filters; in != r->proto_input_filters; 
+        for (in = r->input_filters; in != r->proto_input_filters;
              in = in->next)
         {
             if (f == in) {
@@ -312,7 +312,7 @@
 
     if (ctx->bytes_read > ctx->read_limit) {
         ctx->body_status = APREQ_ERROR_OVERLIMIT;
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, ctx->body_status, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, ctx->body_status, r,
                       "Bytes read (%" APR_UINT64_T_FMT
                       ") exceeds configured read limit (%" APR_UINT64_T_FMT ")",
                       ctx->bytes_read, ctx->read_limit);
@@ -391,7 +391,7 @@
 
     if (ctx->bytes_read > ctx->read_limit) {
         ctx->body_status = APREQ_ERROR_OVERLIMIT;
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, ctx->body_status, r, 
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, ctx->body_status, r,
                       "Bytes read (%" APR_UINT64_T_FMT
                       ") exceeds configured max_body limit (%"
                       APR_UINT64_T_FMT ")",
@@ -480,7 +480,7 @@
     r = f->r;
     d = ap_get_module_config(r->per_dir_config, &apreq_module);
 
-    if (f == r->input_filters 
+    if (f == r->input_filters
         && r->proto_input_filters == f->next
         && f->next->frec->filter_func.in_func == apreq_filter
         && f->r->method_number != M_GET)
@@ -517,7 +517,7 @@
             return;
 
         default:
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, ctx->body_status, r, 
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, ctx->body_status, r,
                           "cannot steal context: bad filter status");
         }
     }

Modified: httpd/apreq/trunk/module/apache2/handle.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/apache2/handle.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/apache2/handle.c (original)
+++ httpd/apreq/trunk/module/apache2/handle.c Sat Aug 20 12:50:35 2005
@@ -36,13 +36,13 @@
     struct apache2_handle *req = (struct apache2_handle *)handle;
 
     if (req->f == NULL) {
-        req->f = ap_add_input_filter(APREQ_FILTER_NAME, NULL, 
-                                     req->r, 
+        req->f = ap_add_input_filter(APREQ_FILTER_NAME, NULL,
+                                     req->r,
                                      req->r->connection);
         /* ap_add_input_filter does not guarantee cfg->f == r->input_filters,
          * so we reposition the new filter there as necessary.
          */
-        apreq_filter_relocate(req->f); 
+        apreq_filter_relocate(req->f);
     }
 
     return req->f;
@@ -58,7 +58,7 @@
         const char *cookies = apr_table_get(r->headers_in, "Cookie");
         if (cookies != NULL) {
             req->jar = apr_table_make(handle->pool, APREQ_DEFAULT_NELTS);
-            req->jar_status = 
+            req->jar_status =
                 apreq_parse_cookie_header(handle->pool, req->jar, cookies);
         }
         else
@@ -77,7 +77,7 @@
     if (req->args_status == APR_EINIT) {
         if (r->args != NULL) {
             req->args = apr_table_make(handle->pool, APREQ_DEFAULT_NELTS);
-            req->args_status = 
+            req->args_status =
                 apreq_parse_query_string(handle->pool, req->args, r->args);
         }
         else
@@ -196,12 +196,12 @@
         if (val != NULL)
             return apreq_value_to_param(val);
 
-        /* Not seen yet, so we need to scan for 
+        /* Not seen yet, so we need to scan for
            param while prefetching the body */
 
         if (ctx->find_param == NULL)
-            ctx->find_param = apreq_hook_make(handle->pool, 
-                                              apreq_hook_find_param, 
+            ctx->find_param = apreq_hook_make(handle->pool,
+                                              apreq_hook_find_param,
                                               NULL, NULL);
         h = ctx->find_param;
         h->next = ctx->parser->hook;
@@ -237,7 +237,7 @@
 }
 
 static
-apr_status_t apache2_parser_get(apreq_handle_t *handle, 
+apr_status_t apache2_parser_get(apreq_handle_t *handle,
                                   const apreq_parser_t **parser)
 {
     ap_filter_t *f = get_apreq_filter(handle);
@@ -252,7 +252,7 @@
 }
 
 static
-apr_status_t apache2_parser_set(apreq_handle_t *handle, 
+apr_status_t apache2_parser_set(apreq_handle_t *handle,
                                 apreq_parser_t *parser)
 {
     ap_filter_t *f = get_apreq_filter(handle);

Modified: httpd/apreq/trunk/module/t/TEST.PL
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/TEST.PL?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/TEST.PL (original)
+++ httpd/apreq/trunk/module/t/TEST.PL Sat Aug 20 12:50:35 2005
@@ -72,7 +72,7 @@
     if (WIN32) {
         require File::Spec;
         my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo);
-        my $libs = join ' ', 
+        my $libs = join ' ',
             (map {'-l' . File::Spec->catfile($mod_apreq2_dir, $_)}
               qw(libapreq2.lib mod_apreq2.lib));
         print $fh <<EOF;
@@ -83,7 +83,7 @@
         \$(APXS) -I../../../apache2 -I../../../../include $libs -llibhttpd $dversion -p -I$self->{cmodules_dir} -c $name.c
 
 clean:
-	-erase @goners vc60.pdb 
+	-erase @goners vc60.pdb
 EOF
     }
     else {

Modified: httpd/apreq/trunk/module/t/big_request.t
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/big_request.t?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/big_request.t (original)
+++ httpd/apreq/trunk/module/t/big_request.t Sat Aug 20 12:50:35 2005
@@ -68,7 +68,7 @@
 
 }
 
-if (Apache::Test::have_ssl() and $scheme ne 'https') {    
+if (Apache::Test::have_ssl() and $scheme ne 'https') {
     $scheme = 'https';
     goto START_TESTS;
 }

Modified: httpd/apreq/trunk/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c (original)
+++ httpd/apreq/trunk/module/t/c-modules/apreq_access_test/mod_apreq_access_test.c Sat Aug 20 12:50:35 2005
@@ -27,7 +27,7 @@
 
 #define APACHE_HTTPD_TEST_ACCESS_CHECKER apreq_access_checker
 #define APACHE_HTTPD_TEST_COMMANDS       access_cmds
-#define APACHE_HTTPD_TEST_PER_DIR_CREATE create_access_config 
+#define APACHE_HTTPD_TEST_PER_DIR_CREATE create_access_config
 
 #include "apache_httpd_test.h"
 #include "apreq_module_apache2.h"
@@ -82,12 +82,12 @@
     else {
         const apr_table_t *t = apreq_params(handle, r->pool);
         if (t != NULL) {
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, r, 
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, r,
                           "%s not found: parsing error detected (%d params)",
                           cfg->param, apr_table_elts(t)->nelts);
         }
         else {
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, r, 
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_EGENERAL, r,
                           "%s not found: paring error detected (no param table)",
                           cfg->param);
         }

Modified: httpd/apreq/trunk/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c (original)
+++ httpd/apreq/trunk/module/t/c-modules/apreq_cookie_test/mod_apreq_cookie_test.c Sat Aug 20 12:50:35 2005
@@ -57,7 +57,7 @@
 
     req = apreq_handle_apache2(r);
 
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, 
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
                   "starting cookie tests");
 
     apreq_args(req, &args);

Modified: httpd/apreq/trunk/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c (original)
+++ httpd/apreq/trunk/module/t/c-modules/apreq_output_filter_test/mod_apreq_output_filter_test.c Sat Aug 20 12:50:35 2005
@@ -47,7 +47,7 @@
 static int dump_table(void *data, const char *key, const char *value)
 {
     struct ctx_t *ctx = (struct ctx_t *)data;
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctx->r, 
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctx->r,
                   "%s => %s", key, value);
     apr_brigade_printf(ctx->bb,NULL,NULL,"\t%s => %s\n", key, value);
     return 1;
@@ -67,7 +67,7 @@
     eos = apr_brigade_split(bb, APR_BRIGADE_LAST(bb));
 
     handle = apreq_handle_apache2(r);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r, 
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r,
                   "appending parsed data");
 
     apr_brigade_puts(bb, NULL, NULL, "\n--APREQ OUTPUT FILTER--\nARGS:\n");
@@ -88,7 +88,7 @@
 static void register_hooks (apr_pool_t *p)
 {
     (void)p;
-    ap_register_output_filter(filter_name, apreq_output_filter_test, 
+    ap_register_output_filter(filter_name, apreq_output_filter_test,
                               apreq_output_filter_test_init,
                               AP_FTYPE_CONTENT_SET);
 }

Modified: httpd/apreq/trunk/module/t/cgi.t
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/cgi.t?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/cgi.t (original)
+++ httpd/apreq/trunk/module/t/cgi.t Sat Aug 20 12:50:35 2005
@@ -15,7 +15,7 @@
 my @big_key_num = (5, 15, 25);
 my @big_keys    = ('a'..'z');
 
-plan tests => 10 + @key_len * @key_num + @big_key_len * @big_key_num, 
+plan tests => 10 + @key_len * @key_num + @big_key_len * @big_key_num,
     have_lwp && have_cgi;
 
 require HTTP::Cookies;
@@ -75,12 +75,12 @@
 ok t_cmp(GET_BODY("$script?foo=%3F&bar=hello+world"),
           "\tfoo => ?$line_end\tbar => hello world$line_end", "simple get");
 
-my $body = POST_BODY($script, content => 
+my $body = POST_BODY($script, content =>
                      "aaa=$filler;foo=1;bar=2;filler=$filler");
 ok t_cmp($body, "\tfoo => 1$line_end\tbar => 2$line_end",
          "simple post");
 
-$body = POST_BODY("$script?foo=1", content => 
+$body = POST_BODY("$script?foo=1", content =>
                   "intro=$filler&bar=2&conclusion=$filler");
 ok t_cmp($body, "\tfoo => 1$line_end\tbar => 2$line_end",
          "simple post");
@@ -123,7 +123,7 @@
     my $key   = 'apache';
     my $value = 'ok';
     my $cookie = "$key=$value";
-    my ($header) = GET_HEAD("$script?test=$test&key=$key", 
+    my ($header) = GET_HEAD("$script?test=$test&key=$key",
                             Cookie => $cookie) =~ /^#Set-Cookie:\s+(.+)/m;
     ok t_cmp($cookie, $header, $test);
 }
@@ -132,7 +132,7 @@
     my $key   = 'apache';
     my $value = 'ok';
     my $cookie = qq{\$Version="1"; $key="$value"; \$Path="$location"};
-    my ($header) = GET_HEAD("$script?test=$test&key=$key", 
+    my ($header) = GET_HEAD("$script?test=$test&key=$key",
                             Cookie => $cookie) =~ /^#Set-Cookie2:\s+(.+)/m;
     ok t_cmp(qq{$key="$value"; Version=1; path="$location"}, $header, $test);
 }

Modified: httpd/apreq/trunk/module/t/cookie.t
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/cookie.t?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/cookie.t (original)
+++ httpd/apreq/trunk/module/t/cookie.t Sat Aug 20 12:50:35 2005
@@ -45,7 +45,7 @@
     my $key   = 'apache';
     my $value = 'ok';
     my $cookie = "$key=$value";
-    my ($header) = GET_HEAD("$location?test=$test&key=$key", 
+    my ($header) = GET_HEAD("$location?test=$test&key=$key",
                             Cookie => $cookie) =~ /^#Set-Cookie:\s+(.+)/m;
 
     ok t_cmp($header, $cookie, $test);
@@ -55,7 +55,7 @@
     my $key   = 'apache';
     my $value = 'ok';
     my $cookie = qq{\$Version="1"; $key="$value"; \$Path="$location"};
-    my ($header) = GET_HEAD("$location?test=$test&key=$key", 
+    my ($header) = GET_HEAD("$location?test=$test&key=$key",
                             Cookie => $cookie) =~ /^#Set-Cookie2:\s+(.+)/m;
     ok t_cmp($header, qq{$key="$value"; Version=1; path="$location"}, $test);
 }

Modified: httpd/apreq/trunk/module/t/request.t
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/t/request.t?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/t/request.t (original)
+++ httpd/apreq/trunk/module/t/request.t Sat Aug 20 12:50:35 2005
@@ -16,10 +16,10 @@
 
 foreach my $location ('/apreq_request_test', '/apreq_access_test') {
 
-    ok t_cmp(GET_BODY("$location?test=1"), "ARGS:\n\ttest => 1\n", 
+    ok t_cmp(GET_BODY("$location?test=1"), "ARGS:\n\ttest => 1\n",
              "simple get");
 
-    ok t_cmp(UPLOAD_BODY("$location?test=2", content => "unused"), 
+    ok t_cmp(UPLOAD_BODY("$location?test=2", content => "unused"),
              "ARGS:\n\ttest => 2\nBODY:\n\tHTTPUPLOAD => b\n",
              "simple upload");
 }
@@ -27,7 +27,7 @@
 ok t_cmp(GET_RC("/apreq_access_test"), 403, "access denied");
 
 my $filler = "0123456789" x 25_000; # length($filler) must be < 500K / 2
-my $body = POST_BODY("/apreq_access_test?foo=1;", 
+my $body = POST_BODY("/apreq_access_test?foo=1;",
                      content => "bar=2&quux=$filler;test=6&more=$filler");
 ok t_cmp($body, <<EOT, "prefetch credentials");
 ARGS:
@@ -42,11 +42,11 @@
 ok t_cmp(GET_RC("/apreq_redirect_test"), 403, "missing 'test' authorization");
 
 foreach my $location ('/apreq_request_test', '/apreq_access_test') {
-    ok t_cmp(GET_BODY("/apreq_redirect_test?test=ok&location=$location%3Ftest=redirect"), 
-             "ARGS:\n\ttest => redirect\n", 
+    ok t_cmp(GET_BODY("/apreq_redirect_test?test=ok&location=$location%3Ftest=redirect"),
+             "ARGS:\n\ttest => redirect\n",
              "redirect GET");
 
-    $body = POST_BODY("/apreq_redirect_test?location=$location%3Ffoo=bar", content => 
+    $body = POST_BODY("/apreq_redirect_test?location=$location%3Ffoo=bar", content =>
             "quux=$filler;test=redirect+with+prefetch;more=$filler");
 
     ok t_cmp($body, <<EOT, "redirect with prefetch");
@@ -75,13 +75,13 @@
 $body = POST_BODY("/apreq_redirect_test?test=redirect_index_txt_POST",
         content => "quux=$filler;location=/index.txt;foo=$filler");
 $body =~ s{\r}{}g;
-ok t_cmp($body, $index_html, 
+ok t_cmp($body, $index_html,
         "redirect /index.txt (POST)");
 
 # output filter tests
 
 sub filter_content ($) {
-   my $body = shift;      
+   my $body = shift;
    $body =~ s/^.*--APREQ OUTPUT FILTER--\s+//s;
    return $body;
 }
@@ -90,8 +90,8 @@
 ok t_cmp(filter_content GET_BODY("/index.html?test=15"),
          "ARGS:\n\ttest => 15\n", "output filter GET");
 
-ok t_cmp(filter_content POST_BODY("/index.html?test=16", content => 
-         "post+data=foo;more=$filler;test=output+filter+POST"), 
+ok t_cmp(filter_content POST_BODY("/index.html?test=16", content =>
+         "post+data=foo;more=$filler;test=output+filter+POST"),
          <<EOT,
 ARGS:
 \ttest => 16
@@ -126,7 +126,7 @@
 \tfoo => $filler
 EOT
 
-if (Apache::Test::have_ssl() and $scheme ne 'https') {    
+if (Apache::Test::have_ssl() and $scheme ne 'https') {
     $scheme = 'https';
     goto START_TESTS;
 }

Modified: httpd/apreq/trunk/module/test_cgi.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/module/test_cgi.c?rev=234120&r1=234119&r2=234120&view=diff
==============================================================================
--- httpd/apreq/trunk/module/test_cgi.c (original)
+++ httpd/apreq/trunk/module/test_cgi.c Sat Aug 20 12:50:35 2005
@@ -25,7 +25,7 @@
 {
     int *c = (int *) count;
     int value_len = key - value - 1; /* == strlen(value) by construction */
-    if (value_len) 
+    if (value_len)
         *c += strlen(key) + value_len;
     return 1;
 }
@@ -80,7 +80,7 @@
             apr_file_printf(out, "\t%s => %s\n", "bar", bar->v.data);
         }
     }
-    
+
     else if (test && key) {
         apreq_cookie_t *cookie;
         char *dest;
@@ -101,7 +101,7 @@
 
         apr_file_printf(out, "%s", "Content-Type: text/plain\n\n");
         dest = apr_pcalloc(pool, cookie->v.dlen + 1);
-        if (apreq_decode(dest, &dlen, cookie->v.data, 
+        if (apreq_decode(dest, &dlen, cookie->v.data,
                          cookie->v.dlen) == APR_SUCCESS)
             apr_file_printf(out, "%s", dest);
         else {
@@ -109,7 +109,7 @@
         }
     }
 
-    else { 
+    else {
         const apr_table_t *params = apreq_params(req, pool);
         int count = 0;
         apr_file_printf(out, "%s", "Content-Type: text/plain\n\n");



Mime
View raw message