You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/10/01 20:08:13 UTC
svn commit: r581030 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Author: niq
Date: Mon Oct 1 11:08:13 2007
New Revision: 581030
URL: http://svn.apache.org/viewvc?rev=581030&view=rev
Log:
No change, but they won't let me have foo
(and ... this is the module with a function addit_dammit !!!)
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=581030&r1=581029&r2=581030&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Mon Oct 1 11:08:13 2007
@@ -98,16 +98,16 @@
}
/* Clear all connection-based headers from the incoming headers table */
-typedef struct foo {
+typedef struct header_dptr {
apr_pool_t *pool;
apr_table_t *table;
apr_time_t time;
-} foo;
+} header_dptr;
static ap_regex_t *warn_rx;
static int clean_warning_headers(void *data, const char *key, const char *val)
{
- apr_table_t *headers = ((foo*)data)->table;
- apr_pool_t *pool = ((foo*)data)->pool;
+ apr_table_t *headers = ((header_dptr*)data)->table;
+ apr_pool_t *pool = ((header_dptr*)data)->pool;
char *warning;
char *date;
apr_time_t warn_time;
@@ -115,7 +115,7 @@
ap_regmatch_t pmatch[3];
if (headers == NULL) {
- ((foo*)data)->table = headers = apr_table_make(pool, 2);
+ ((header_dptr*)data)->table = headers = apr_table_make(pool, 2);
}
/*
* Parse this, suckers!
@@ -145,7 +145,7 @@
pmatch[2].rm_eo - pmatch[2].rm_so);
warn_time = apr_date_parse_http(date);
}
- if (!warn_time || (warn_time == ((foo*)data)->time)) {
+ if (!warn_time || (warn_time == ((header_dptr*)data)->time)) {
apr_table_addn(headers, key, warning);
}
val += pmatch[0].rm_eo;
@@ -154,7 +154,7 @@
}
static apr_table_t *ap_proxy_clean_warnings(apr_pool_t *p, apr_table_t *headers)
{
- foo x;
+ header_dptr x;
x.pool = p;
x.table = NULL;
x.time = apr_date_parse_http(apr_table_get(headers, "Date"));
@@ -169,8 +169,8 @@
}
static int clear_conn_headers(void *data, const char *key, const char *val)
{
- apr_table_t *headers = ((foo*)data)->table;
- apr_pool_t *pool = ((foo*)data)->pool;
+ apr_table_t *headers = ((header_dptr*)data)->table;
+ apr_pool_t *pool = ((header_dptr*)data)->pool;
const char *name;
char *next = apr_pstrdup(pool, val);
while (*next) {
@@ -187,7 +187,7 @@
}
static void ap_proxy_clear_connection(apr_pool_t *p, apr_table_t *headers)
{
- foo x;
+ header_dptr x;
x.pool = p;
x.table = headers;
apr_table_unset(headers, "Proxy-Connection");
Re: svn commit: r581030 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Oct 1, 2007, at 2:18 PM, Nick Kew wrote:
> On Mon, 1 Oct 2007 14:12:44 -0400
> Jim Jagielski <ji...@devsys.jaguNET.com> wrote:
>
>> Well, at least addit_dammit is descriptive :)
>
> Aha, so the struct should've been called holdit_dammit!
:)
Re: svn commit: r581030 -
/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Posted by Nick Kew <ni...@webthing.com>.
On Mon, 1 Oct 2007 14:12:44 -0400
Jim Jagielski <ji...@devsys.jaguNET.com> wrote:
> Well, at least addit_dammit is descriptive :)
Aha, so the struct should've been called holdit_dammit!
--
Nick Kew
Application Development with Apache - the Apache Modules Book
http://www.apachetutor.org/
Re: svn commit: r581030 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Posted by Jim Jagielski <ji...@devsys.jaguNET.com>.
On Mon, Oct 01, 2007 at 06:08:13PM -0000, niq@apache.org wrote:
> Author: niq
> Date: Mon Oct 1 11:08:13 2007
> New Revision: 581030
>
> URL: http://svn.apache.org/viewvc?rev=581030&view=rev
> Log:
> No change, but they won't let me have foo
> (and ... this is the module with a function addit_dammit !!!)
>
Well, at least addit_dammit is descriptive :)
--
===========================================================================
Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/
"If you can dodge a wrench, you can dodge a ball."
Re: svn commit: r581030 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Posted by Jim Jagielski <ji...@devsys.jaguNET.com>.
On Mon, Oct 01, 2007 at 06:08:13PM -0000, niq@apache.org wrote:
> Author: niq
> Date: Mon Oct 1 11:08:13 2007
> New Revision: 581030
>
> URL: http://svn.apache.org/viewvc?rev=581030&view=rev
> Log:
> No change, but they won't let me have foo
> (and ... this is the module with a function addit_dammit !!!)
>
Well, at least addit_dammit is descriptive :)
--
===========================================================================
Jim Jagielski [|] jim@jaguNET.com [|] http://www.jaguNET.com/
"If you can dodge a wrench, you can dodge a ball."