Django

Code

Show
Ignore:
Timestamp:
06/30/08 10:38:16 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7768 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808
  • django/branches/newforms-admin/django/core/servers/basehttp.py

    r7770 r7809  
    552552        from django.conf import settings 
    553553        self.admin_media_prefix = settings.ADMIN_MEDIA_PREFIX 
     554        # We set self.path to avoid crashes in log_message() on unsupported 
     555        # requests (like "OPTIONS"). 
     556        self.path = '' 
    554557        BaseHTTPRequestHandler.__init__(self, *args, **kwargs) 
    555558 
  • django/branches/newforms-admin/django/core/servers/fastcgi.py

    r7351 r7809  
    4141  outlog=FILE          write stdout to this file. 
    4242  errlog=FILE          write stderr to this file. 
     43  umask=UMASK          umask to use when daemonizing (default 022). 
    4344 
    4445Examples: 
     
    7475    'outlog': None, 
    7576    'errlog': None, 
     77    'umask': None, 
    7678} 
    7779 
     
    160162    if options['errlog']: 
    161163        daemon_kwargs['err_log'] = options['errlog'] 
     164    if options['umask']: 
     165        daemon_kwargs['umask'] = int(options['umask']) 
    162166 
    163167    if daemonize: