Changeset 106:ae5fe54fba18

Show
Ignore:
Timestamp:
11/04/09 08:46:14 (4 months ago)
Author:
Allan Saddi <allan@saddi.com>
branch:
default
Message:

Cancel alarm before restoring old SIGALRM handler. #43

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • flup/server/ajp_base.py

    r103 r106  
    726726        # Restore old handler if timeout was given 
    727727        if self._timeout: 
     728            signal.alarm(0) 
    728729            signal.signal(signal.SIGALRM, old_alarm) 
    729730 

  • flup/server/fcgi_base.py

    r103 r106  
    586586        # Restore old handler if timeout was given 
    587587        if self._timeout: 
     588            signal.alarm(0) 
    588589            signal.signal(signal.SIGALRM, old_alarm) 
    589590 

  • flup/server/preforkserver.py

    r104 r106  
    266266                del self._children[pid] 
    267267 
     268        signal.alarm(0) 
    268269        signal.signal(signal.SIGALRM, oldSIGALRM) 
    269270 

  • flup/server/scgi_base.py

    r103 r106  
    288288        # Restore old handler if timeout was given 
    289289        if self._timeout: 
     290            signal.alarm(0) 
    290291            signal.signal(signal.SIGALRM, old_alarm) 
    291292