Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #14398 -- Changed runfcgi command to interpret the umask option…

… argument as an octal value.

Thanks petteyg for report and aptiko for help with the fix.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0b39bf02b94be859b418e1fbc19e50be8100c0f3 1 parent e716a71
Ramiro Morales authored October 27, 2010

Showing 1 changed file with 8 additions and 8 deletions. Show diff stats Hide diff stats

  1. 16  django/core/servers/fastcgi.py
16  django/core/servers/fastcgi.py
@@ -27,22 +27,22 @@
27 27
 
28 28
 Optional Fcgi settings: (setting=value)
29 29
   protocol=PROTOCOL    fcgi, scgi, ajp, ... (default fcgi)
30  
-  host=HOSTNAME        hostname to listen on..
  30
+  host=HOSTNAME        hostname to listen on.
31 31
   port=PORTNUM         port to listen on.
32 32
   socket=FILE          UNIX socket to listen on.
33  
-  method=IMPL          prefork or threaded (default prefork)
34  
-  maxrequests=NUMBER   number of requests a child handles before it is 
  33
+  method=IMPL          prefork or threaded (default prefork).
  34
+  maxrequests=NUMBER   number of requests a child handles before it is
35 35
                        killed and a new child is forked (0 = no limit).
36  
-  maxspare=NUMBER      max number of spare processes / threads
  36
+  maxspare=NUMBER      max number of spare processes / threads.
37 37
   minspare=NUMBER      min number of spare processes / threads.
38  
-  maxchildren=NUMBER   hard limit number of processes / threads
  38
+  maxchildren=NUMBER   hard limit number of processes / threads.
39 39
   daemonize=BOOL       whether to detach from terminal.
40 40
   pidfile=FILE         write the spawned process-id to this file.
41 41
   workdir=DIRECTORY    change to this directory when daemonizing.
42  
-  debug=BOOL           set to true to enable flup tracebacks
  42
+  debug=BOOL           set to true to enable flup tracebacks.
43 43
   outlog=FILE          write stdout to this file.
44 44
   errlog=FILE          write stderr to this file.
45  
-  umask=UMASK          umask to use when daemonizing (default 022).
  45
+  umask=UMASK          umask to use when daemonizing, in octal notation (default 022).
46 46
 
47 47
 Examples:
48 48
   Run a "standard" fastcgi process on a file-descriptor
@@ -166,7 +166,7 @@ def runfastcgi(argset=[], **kwargs):
166 166
     if options['errlog']:
167 167
         daemon_kwargs['err_log'] = options['errlog']
168 168
     if options['umask']:
169  
-        daemon_kwargs['umask'] = int(options['umask'])
  169
+        daemon_kwargs['umask'] = int(options['umask'], 8)
170 170
 
171 171
     if daemonize:
172 172
         from django.utils.daemonize import become_daemon

0 notes on commit 0b39bf0

Please sign in to comment.
Something went wrong with that request. Please try again.