You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/08/03 21:36:33 UTC
cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
wrowe 2002/08/03 12:36:33
Modified: modules/dav/main mod_dav.c
modules/experimental mod_cache.c
modules/http http_protocol.c
modules/mappers mod_negotiation.c
Log:
catch up with the apr_atoll -> apr_atoi64 rename
Revision Changes Path
1.84 +4 -4 httpd-2.0/modules/dav/main/mod_dav.c
Index: mod_dav.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mod_dav.c 24 Jul 2002 20:47:28 -0000 1.83
+++ mod_dav.c 3 Aug 2002 19:36:32 -0000 1.84
@@ -761,11 +761,11 @@
*dash = *slash = '\0';
- *range_start = apr_atoll(range + 6);
- *range_end = apr_atoll(dash + 1);
+ *range_start = apr_atoi64(range + 6);
+ *range_end = apr_atoi64(dash + 1);
if (*range_end < *range_start
- || (slash[1] != '*' && apr_atoll(slash + 1) <= *range_end)) {
+ || (slash[1] != '*' && apr_atoi64(slash + 1) <= *range_end)) {
/* invalid range. ignore it (per S14.16 of RFC2616) */
return 0;
}
@@ -2318,7 +2318,7 @@
return HTTP_BAD_REQUEST;
}
- r->remaining = apr_atoll(lenp);
+ r->remaining = apr_atoi64(lenp);
}
if (r->read_chunked || r->remaining > 0) {
1.50 +1 -1 httpd-2.0/modules/experimental/mod_cache.c
Index: mod_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mod_cache.c 24 Jul 2002 20:47:28 -0000 1.49
+++ mod_cache.c 3 Aug 2002 19:36:33 -0000 1.50
@@ -577,7 +577,7 @@
const char* cl;
cl = apr_table_get(r->headers_out, "Content-Length");
if (cl) {
- size = apr_atoll(cl);
+ size = apr_atoi64(cl);
}
else {
1.451 +3 -3 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -r1.450 -r1.451
--- http_protocol.c 24 Jul 2002 20:47:28 -0000 1.450
+++ http_protocol.c 3 Aug 2002 19:36:33 -0000 1.451
@@ -2719,15 +2719,15 @@
if ((dash == range)) {
/* In the form "-5" */
- *start = clength - apr_atoll(dash + 1);
+ *start = clength - apr_atoi64(dash + 1);
*end = clength - 1;
}
else {
*dash = '\0';
dash++;
- *start = apr_atoll(range);
+ *start = apr_atoi64(range);
if (*dash) {
- *end = apr_atoll(dash);
+ *end = apr_atoi64(dash);
}
else { /* "5-" */
*end = clength - 1;
1.105 +1 -1 httpd-2.0/modules/mappers/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mod_negotiation.c 24 Jul 2002 20:47:28 -0000 1.104
+++ mod_negotiation.c 3 Aug 2002 19:36:33 -0000 1.105
@@ -948,7 +948,7 @@
has_content = 1;
}
else if (!strncmp(buffer, "content-length:", 15)) {
- mime_info.bytes = apr_atoll((char *)body);
+ mime_info.bytes = apr_atoi64((char *)body);
has_content = 1;
}
else if (!strncmp(buffer, "content-language:", 17)) {