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_4_0RC2'.
[m6w6/ext-http]
/
http_cache_api.c
diff --git
a/http_cache_api.c
b/http_cache_api.c
index adba374d5c65ef90726a5e4d4f9100a07a092709..b6c4fad5963ca79fa7041cbcf7080fb8094d1f14 100644
(file)
--- a/
http_cache_api.c
+++ b/
http_cache_api.c
@@
-45,9
+45,9
@@
PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
return NULL;
} else {
size_t ssb_len;
return NULL;
} else {
size_t ssb_len;
- char ssb_buf[128]
= {0}
;
+ char ssb_buf[128];
- ssb_len = snprintf(ssb_buf,
127
, "%ld=%ld=%ld", (long) ssb.sb.st_mtime,
+ ssb_len = snprintf(ssb_buf,
sizeof(ssb_buf)
, "%ld=%ld=%ld", (long) ssb.sb.st_mtime,
(long) ssb.sb.st_ino,
(long) ssb.sb.st_size);
http_etag_update(ctx, ssb_buf, ssb_len);
(long) ssb.sb.st_ino,
(long) ssb.sb.st_size);
http_etag_update(ctx, ssb_buf, ssb_len);
@@
-78,7
+78,9
@@
PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
zval *zmodified;
char *modified, *chr_ptr;
zval *zmodified;
char *modified, *chr_ptr;
- HTTP_GSC(zmodified, entry, !enforce_presence);
+ if (!(zmodified = http_get_server_var(entry, 1))) {
+ return !enforce_presence;
+ }
modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified));
if ((chr_ptr = strrchr(modified, ';'))) {
modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified));
if ((chr_ptr = strrchr(modified, ';'))) {
@@
-98,7
+100,9
@@
PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag,
char *quoted_etag;
zend_bool result;
char *quoted_etag;
zend_bool result;
- HTTP_GSC(zetag, entry, !enforce_presence);
+ if (!(zetag = http_get_server_var_ex(entry, strlen(entry)+1, 1))) {
+ return !enforce_presence;
+ }
if (NULL != strchr(Z_STRVAL_P(zetag), '*')) {
return 1;
if (NULL != strchr(Z_STRVAL_P(zetag), '*')) {
return 1;