version 1.356, 2005/05/30 14:35:34
|
version 1.357, 2005/06/07 13:37:11
|
Line 1126 static int precondition_handler (HTReque
|
Line 1126 static int precondition_handler (HTReque
|
if (prompt) |
if (prompt) |
{ |
{ |
if (me->method == METHOD_GET) |
if (me->method == METHOD_GET) |
{ |
{ |
/* @@@@ IV */ |
/* @@@@ IV */ |
(*prompt) (request, HT_A_CONFIRM, status, NULL, NULL, NULL); |
(*prompt) (request, HT_A_CONFIRM, status, NULL, NULL, NULL); |
force_put = NO; |
force_put = NO; |
} |
} |
else |
else |
force_put = (*prompt) (request, HT_A_CONFIRM, HT_MSG_RULES, |
force_put = ((*prompt)(request, HT_A_CONFIRM, HT_MSG_RULES, NULL, NULL, NULL) != 0); |
NULL, NULL, NULL); |
|
} |
} |
else |
else |
force_put = NO; |
force_put = NO; |
Line 1288 static int check_handler (HTRequest * re
|
Line 1287 static int check_handler (HTRequest * re
|
else |
else |
{ |
{ |
if (prompt) |
if (prompt) |
force_put = (*prompt) (request, HT_A_CONFIRM, HT_MSG_FILE_REPLACE, |
force_put = ((*prompt)(request, HT_A_CONFIRM, HT_MSG_FILE_REPLACE, NULL, NULL, NULL) != 0); |
NULL, NULL, NULL); |
|
else |
else |
force_put = FALSE; |
force_put = FALSE; |
|
|
if (force_put) |
if (force_put) |
{ |
{ |
Line 2242 int i;
|
Line 2240 int i;
|
strcpy (cache_lockfile, real_dir); |
strcpy (cache_lockfile, real_dir); |
strcat (cache_lockfile, ".lock"); |
strcat (cache_lockfile, ".lock"); |
cache_locked = FALSE; |
cache_locked = FALSE; |
if (TtaFileExist (cache_lockfile) && !(cache_locked = test_cachelock (cache_lockfile))) |
if ( TtaFileExist(cache_lockfile) && |
{ |
!(cache_locked = (test_cachelock(cache_lockfile) != 0)) |
|
) |
|
{ |
#ifdef DEBUG_LIBWWW |
#ifdef DEBUG_LIBWWW |
fprintf (stderr, "found a stale cache, removing it\n"); |
fprintf (stderr, "found a stale cache, removing it\n"); |
#endif /* DEBUG_LIBWWW */ |
#endif /* DEBUG_LIBWWW */ |
/* remove the lock and clean the cache (the clean cache |
/* remove the lock and clean the cache (the clean cache |
will remove all, making the following call unnecessary */ |
will remove all, making the following call unnecessary */ |
/* little trick to win some memory */ |
/* little trick to win some memory */ |
strptr = strrchr (cache_lockfile, '.'); |
strptr = strrchr (cache_lockfile, '.'); |
*strptr = EOS; |
*strptr = EOS; |
RecCleanCache (cache_lockfile); |
RecCleanCache (cache_lockfile); |
*strptr = '.'; |
*strptr = '.'; |
} |
} |
|
|
if (!cache_locked) |
if (!cache_locked) |
{ |
{ |