← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/squid3/jaunty-security

« back to all changes in this revision

Viewing changes to src/WinSvc.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luigi Gangitano
  • Date: 2008-07-21 09:20:31 UTC
  • mfrom: (1.1.7 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080721092031-bj8vog645lw6487u
Tags: 3.0.STABLE8-1
* Urgency high to meet freeze deadline

* New upstream release

* debian/patches/10-mgr_active_requests
  - Added upstream patch fixing delay_pool reporting in cachemgr.cgi

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/WinSvc.cc
390
390
    WIN32_Exit();
391
391
}
392
392
 
 
393
#ifdef _SQUID_MSWIN_
393
394
void
394
395
WIN32_IpAddrChangeMonitorExit()
395
396
{
396
397
    DWORD status = ERROR_SUCCESS;
397
398
 
398
 
    if (NotifyAddrChange_thread == INVALID_HANDLE_VALUE) {
 
399
    if (NotifyAddrChange_thread != INVALID_HANDLE_VALUE) {
399
400
        TerminateThread(NotifyAddrChange_thread, status);
400
401
        CloseHandle(NotifyAddrChange_thread);
401
402
    }
402
403
}
 
404
#endif
403
405
 
404
406
void
405
407
WIN32_Exit()
459
461
    DWORD status = ERROR_SUCCESS;
460
462
    DWORD threadID = 0, ThrdParam = 0;
461
463
 
462
 
    if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) {
 
464
    if ((WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) && (Config.onoff.WIN32_IpAddrChangeMonitor)) {
463
465
        NotifyAddrChange_thread = CreateThread(NULL, 0, WIN32_IpAddrChangeMonitor,
464
466
            &ThrdParam, 0, &threadID);
465
467
        if (NotifyAddrChange_thread == NULL) {