joes 2003/01/20 18:34:33
Modified: src apreq.h apreq.c apreq_tables.c
Log:
Prep for cookies.
Revision Changes Path
1.3 +5 -4 httpd-apreq-2/src/apreq.h
Index: apreq.h
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apreq.h 20 Jan 2003 01:54:43 -0000 1.2
+++ apreq.h 21 Jan 2003 02:34:32 -0000 1.3
@@ -21,7 +21,7 @@
#define APREQ_XML_ENCTYPE_LENGTH 15
#define APREQ_EXPIRES_HTTP 1
-#define APREQ_EXPIRES_NSCOOKIE 2
+#define APREQ_EXPIRES_COOKIE 2
#define APREQ_DEFAULT_POST_MAX -1 /* XXX: unsafe default ??? */
#define APREQ_DEFAULT_NELTS 8
@@ -89,12 +89,13 @@
/* returns date string, (time_str is offset from "now") formatted
* either as an NSCOOKIE or HTTP date */
-char *apreq_expires(apr_pool_t *p, char *time_str, int type);
+char *apreq_expires(apr_pool_t *p, const char *time_str, const int type);
/* file sizes (KMG) to bytes */
-apr_int64_t apreq_atol(const char *s);
+apr_int64_t apreq_atoi64(const char *s);
+
/* "duration" strings (YMDhms) to seconds */
-apr_int64_t apreq_atod(const char *s);
+long apreq_atol(const char *s);
#ifdef __cplusplus
}
1.3 +4 -4 httpd-apreq-2/src/apreq.c
Index: apreq.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apreq.c 20 Jan 2003 01:54:43 -0000 1.2
+++ apreq.c 21 Jan 2003 02:34:32 -0000 1.3
@@ -76,7 +76,7 @@
return rv;
}
-char *apreq_expires(apr_pool_t *p, char *time_str, int type)
+char *apreq_expires(apr_pool_t *p, const char *time_str, const int type)
{
apr_time_t when;
apr_time_exp_t tms;
@@ -88,7 +88,7 @@
when = apr_time_now();
if ( strcasecmp(time_str,"now") != 0 )
- when += apreq_atod(time_str);
+ when += apreq_atol(time_str);
if ( apr_time_exp_gmt(&tms, when) != APR_SUCCESS )
return NULL;
@@ -103,7 +103,7 @@
/* used for specifying file & byte sizes */
-apr_int64_t apreq_atol(const char *s) {
+apr_int64_t apreq_atoi64(const char *s) {
apr_int64_t n = 0;
char *p;
if (s == NULL)
@@ -128,7 +128,7 @@
/* converts date offsets (e.g. "+3M") to seconds */
-apr_int64_t apreq_atod(const char *s)
+long apreq_atol(const char *s)
{
apr_int64_t n = 0;
char *p;
1.3 +1 -1 httpd-apreq-2/src/apreq_tables.c
Index: apreq_tables.c
===================================================================
RCS file: /home/cvs/httpd-apreq-2/src/apreq_tables.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apreq_tables.c 20 Jan 2003 01:54:43 -0000 1.2
+++ apreq_tables.c 21 Jan 2003 02:34:32 -0000 1.3
@@ -241,7 +241,7 @@
return -1;
}
- switch (flags & 3) {
+ switch (flags) {
int parent;
case TREE_PUSH:
