projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_1_6_0'.
[m6w6/ext-http]
/
http_headers_api.c
diff --git
a/http_headers_api.c
b/http_headers_api.c
index bdee9a39069f741be65cda5f07fe9ad209474cce..dbbf999040157b17fef8152baedd7f38ea77c0b1 100644
(file)
--- a/
http_headers_api.c
+++ b/
http_headers_api.c
@@
-156,7
+156,7
@@
PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr);
- quality =
atof(ptr
);
+ quality =
zend_strtod(ptr, NULL
);
identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
} else {
quality = 1000.0 - i++;
identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry));
} else {
quality = 1000.0 - i++;
@@
-253,13
+253,21
@@
PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_
switch (begin) {
/* "0-12345" */
case -10:
switch (begin) {
/* "0-12345" */
case -10:
- /* "0-" */
- if (end == -1) {
- return RANGE_NO;
- }
- /* "0-0" or overflow */
- if (end == -10 || length <= (size_t) end) {
- return RANGE_ERR;
+ switch (end) {
+ /* "0-" */
+ case -1:
+ return RANGE_NO;
+
+ /* "0-0" */
+ case -10:
+ end = 0;
+ break;
+
+ default:
+ if (length <= (size_t) end) {
+ return RANGE_ERR;
+ }
+ break;
}
begin = 0;
break;
}
begin = 0;
break;