You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/06/07 22:07:42 UTC
cvs commit: httpd-apreq-2/src apreq.c apreq.h apreq_cookie.c apreq_cookie.h apreq_params.c apreq_params.h
joes 2003/06/07 13:07:42
Modified: src apreq.c apreq.h apreq_cookie.c apreq_cookie.h
apreq_params.c apreq_params.h
Log:
Drop version argument from make_cookie.
Revision Changes Path
1.19 +0 -1 httpd-apreq-2/src/apreq.c
Index: apreq.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apreq.c 20 May 2003 20:10:59 -0000 1.18
+++ apreq.c 7 Jun 2003 20:07:41 -0000 1.19
@@ -111,7 +111,6 @@
return v;
}
-APR_INLINE
APREQ_DECLARE(const char *)apreq_enctype(void *env)
{
char *enctype;
1.19 +0 -2 httpd-apreq-2/src/apreq.h
Index: apreq.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apreq.h 20 May 2003 20:10:59 -0000 1.18
+++ apreq.h 7 Jun 2003 20:07:41 -0000 1.19
@@ -101,8 +101,6 @@
/**
*
*/
-
-APR_INLINE
APREQ_DECLARE(const char *)apreq_enctype(void *env);
/**
1.14 +7 -8 httpd-apreq-2/src/apreq_cookie.c
Index: apreq_cookie.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_cookie.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apreq_cookie.c 20 May 2003 20:10:59 -0000 1.13
+++ apreq_cookie.c 7 Jun 2003 20:07:41 -0000 1.14
@@ -111,10 +111,10 @@
return RFC;
}
-static apr_status_t apreq_cookie_attr(apr_pool_t *p,
- apreq_cookie_t *c,
- char *attr,
- char *val)
+APREQ_DECLARE(apr_status_t) apreq_cookie_attr(apr_pool_t *p,
+ apreq_cookie_t *c,
+ char *attr,
+ char *val)
{
if ( attr[0] == '-' || attr[0] == '$' )
++attr;
@@ -176,7 +176,6 @@
}
APREQ_DECLARE(apreq_cookie_t *) apreq_make_cookie(apr_pool_t *p,
- const apreq_cookie_version_t version,
const char *name, const apr_size_t nlen,
const char *value, const apr_size_t vlen)
{
@@ -188,7 +187,7 @@
memcpy(v->data, value, vlen);
v->data[vlen] = 0;
- c->version = version;
+ c->version = APREQ_COOKIE_VERSION;
/* session cookie is the default */
@@ -384,8 +383,8 @@
status = get_pair(&hdr, &name, &nlen, &value, &vlen);
if (status == APR_SUCCESS) {
- c = apreq_make_cookie(p, version, name, nlen,
- value, vlen);
+ c = apreq_make_cookie(p, name, nlen, value, vlen);
+ c->version = version;
apreq_log(APREQ_DEBUG status, env,
"adding cookie: %s => %s", c->v.name, c->v.data);
apreq_add_cookie(j, c);
1.13 +10 -9 httpd-apreq-2/src/apreq_cookie.h
Index: apreq_cookie.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_cookie.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apreq_cookie.h 20 May 2003 20:10:59 -0000 1.12
+++ apreq_cookie.h 7 Jun 2003 20:07:42 -0000 1.13
@@ -96,21 +96,22 @@
* The cookie is allocated from the ctx pool.
*
* @param ctx The current context.
- * @param v The cookie version, currently one of ::NETSCAPE or ::RFC.
- * Use ::APREQ_COOKIE_VERSION if you'd like to leave
- * that decision up to libapreq. Currently libapreq uses
- * Netscape cookies by default, but this may change in a
- * future version.
* @param name The cookie's name.
* @param nlen Length of name.
* @param value The cookie's value.
* @param vlen Length of value.
*/
-APREQ_DECLARE(apreq_cookie_t *) apreq_make_cookie(apr_pool_t *p,
- const apreq_cookie_version_t version,
+APREQ_DECLARE(apreq_cookie_t *) apreq_make_cookie(apr_pool_t *pool,
const char *name, const apr_size_t nlen,
const char *value, const apr_size_t vlen);
+
+APREQ_DECLARE(apr_status_t) apreq_cookie_attr(apr_pool_t *p,
+ apreq_cookie_t *c,
+ char *attr,
+ char *val);
+
+
/**
* Returns a string that represents the cookie as it would appear
* in a valid "Set-Cookie*" header.
@@ -153,7 +154,7 @@
*
* @param c The cookie.
*/
-APREQ_DECLARE(apr_status_t) apreq_bake_cookie(const apreq_cookie_t *c,
+APREQ_DECLARE(apr_status_t) apreq_cookie_bake(const apreq_cookie_t *c,
void *env);
/* XXX: how about baking whole cookie jars, too ??? */
@@ -163,7 +164,7 @@
*
* @param c The cookie.
*/
-APREQ_DECLARE(apr_status_t) apreq_bake2_cookie(const apreq_cookie_t *c,
+APREQ_DECLARE(apr_status_t) apreq_cookie_bake2(const apreq_cookie_t *c,
void *env);
APREQ_DECLARE(apreq_cookie_version_t) apreq_ua_cookie_version(void *env);
1.17 +2 -2 httpd-apreq-2/src/apreq_params.c
Index: apreq_params.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apreq_params.c 20 May 2003 20:10:59 -0000 1.16
+++ apreq_params.c 7 Jun 2003 20:07:42 -0000 1.17
@@ -139,7 +139,7 @@
return req;
}
-APR_INLINE
+
APREQ_DECLARE(apreq_param_t *)apreq_param(const apreq_request_t *req,
const char *name)
{
@@ -163,7 +163,7 @@
}
-APR_INLINE
+
APREQ_DECLARE(apr_table_t *) apreq_params(apr_pool_t *pool,
const apreq_request_t *req)
{
1.14 +0 -2 httpd-apreq-2/src/apreq_params.h
Index: apreq_params.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_params.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- apreq_params.h 20 May 2003 20:10:59 -0000 1.13
+++ apreq_params.h 7 Jun 2003 20:07:42 -0000 1.14
@@ -132,7 +132,6 @@
* @remark Also parses the request as necessary.
*/
-APR_INLINE
APREQ_DECLARE(apreq_param_t *) apreq_param(const apreq_request_t *req,
const char *name);
@@ -145,7 +144,6 @@
* @remark Also parses the request as necessary.
*/
-APR_INLINE
APREQ_DECLARE(apr_table_t *) apreq_params(apr_pool_t *p,
const apreq_request_t *req);