TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

double check conditional get

Browse Source
This commit is contained in:
David Rose 2003-01-29 21:44:54 +00:00
parent cd42ed6917
commit c8ae0f58cb
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandaapp/src/httpbackup/Sources.pp
View File

@ -8,7 +8,7 @@
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase \ progbase \
express:c downloader:c pandaexpress:m \ express:c downloader:c pandaexpress:m \
net:c panda:m panda:m
#define SOURCES \ #define SOURCES \
backupCatalog.I backupCatalog.cxx backupCatalog.h \ backupCatalog.I backupCatalog.cxx backupCatalog.h \

32
pandaapp/src/httpbackup/httpBackup.cxx
View File

@ -293,7 +293,15 @@ fetch_latest() {
nout << "Fetching " << document_spec.get_url() << "\n"; nout << "Fetching " << document_spec.get_url() << "\n";
PT(HTTPChannel) channel = _http.make_channel(true); PT(HTTPChannel) channel = _http.make_channel(true);
if (!channel->get_document(document_spec)) { if (_always_download) {
channel->get_document(document_spec);
} else {
// Start out by asking for the header first, so we can verify the
// document has changed before we try to download it again.
channel->get_header(document_spec);
}
if (!channel->is_valid()) {
if (channel->get_status_code() == 304) { if (channel->get_status_code() == 304) {
nout << "Document has not been modified.\n"; nout << "Document has not been modified.\n";
// This is considered a success condition. // This is considered a success condition.
@ -304,7 +312,27 @@ fetch_latest() {
return false; return false;
} }
// The document is available. Create an Entry for it. // The document is available.
if (!_always_download) {
if (!entries.empty()) {
// Has it been modified? We need to check again because the
// If-None-Match fields, etc. might have been ignored (e.g. by a
// proxy).
if (document_spec == channel->get_document_spec()) {
nout
<< "Document has not been modified (server ignored conditional request).\n";
return true;
}
}
// Ok, the document really is ready. Go ahead and download it.
if (!channel->get_document(document_spec)) {
nout << "Unable to request document.\n";
return false;
}
}
// We've started to download the document. Create an entry for it.
BackupCatalog::Entry *entry = new BackupCatalog::Entry; BackupCatalog::Entry *entry = new BackupCatalog::Entry;
entry->_document_name = _document_name; entry->_document_name = _document_name;
entry->_document_spec = channel->get_document_spec(); entry->_document_spec = channel->get_document_spec();