projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix crash if there's no response status string after the response code
[m6w6/ext-http]
/
http_cache_api.c
diff --git
a/http_cache_api.c
b/http_cache_api.c
index a03a9616f1dba581c81b7b706681dc268a57c1c1..832656466972a38be1a69ead9a98e14f798b4fb9 100644
(file)
--- a/
http_cache_api.c
+++ b/
http_cache_api.c
@@
-85,6
+85,7
@@
PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
if ((chr_ptr = strrchr(modified, ';'))) {
chr_ptr = 0;
}
if ((chr_ptr = strrchr(modified, ';'))) {
chr_ptr = 0;
}
+
retval = (t <= http_parse_date(modified));
efree(modified);
return retval;
retval = (t <= http_parse_date(modified));
efree(modified);
return retval;
@@
-229,6
+230,8
@@
void _http_ob_etaghandler(char *output, uint output_len,
http_send_etag_ex(etag, strlen(etag), &sent_header);
if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
http_send_etag_ex(etag, strlen(etag), &sent_header);
if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+ /* force exit; ob within ob does not work */
+ HTTP_G->force_exit = 1;
http_exit_ex(304, sent_header, etag, 0);
}
http_exit_ex(304, sent_header, etag, 0);
}