From ce165f7bbf0c481a20db6b4b9f764b8bb89348ba Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 17 Jun 2011 13:08:36 +0000 Subject: Fixed #16099 -- Enabled threading for the runserver management command and added a --nothreading option to disable it if needed. This should help Google Chrome users because it opens more than one connection speculatively. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16427 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/man/django-admin.1 | 5 ++++- docs/ref/django-admin.txt | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1 index 73815ef68b..62e45ae50e 100644 --- a/docs/man/django-admin.1 +++ b/docs/man/django-admin.1 @@ -75,7 +75,7 @@ Runs this project as a FastCGI application. Requires flup. Use .B runfcgi help for help on the KEY=val pairs. .TP -.BI "runserver [" "\-\-noreload" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-ipv6" "] [" "\-\-adminmedia=ADMIN_MEDIA_PATH" "] [" "port|ipaddr:port" "]" +.BI "runserver [" "\-\-noreload" "] [" "\-\-nothreading" "] [" "\-\-nostatic" "] [" "\-\-insecure" "] [" "\-\-ipv6" "] [" "\-\-adminmedia=ADMIN_MEDIA_PATH" "] [" "port|ipaddr:port" "]" Starts a lightweight Web server for development. .TP .BI "shell [" "\-\-plain" "]" @@ -167,6 +167,9 @@ Disable the development server's auto\-reloader. .I \-\-nostatic Disable automatic serving of static files from STATIC_URL. .TP +.I \-\-nothreading +Disable the development server's threading. +.TP .I \-\-insecure Enables serving of static files even if DEBUG is False. .TP diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 812a82e208..0b116f8c23 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -688,6 +688,13 @@ Example usage:: django-admin.py runserver --noreload +.. django-admin-option:: --nothreading + +.. versionadded:: 1.4 + +Use the ``--nothreading`` option to disable the use of threading in the +development server. + .. django-admin-option:: --ipv6, -6 .. versionadded:: 1.3 -- cgit v1.3