add ipv6 support to built-in django runserver, backported from

	https://code.djangoproject.com/ticket/7735
include arguments in runserver, so that --ip6 can be passed in
 - Legacy-Id: 5419

Author: mcr

v4.41/django/core/management/commands/runserver.py

@@ -1,10 +1,17 @@
 from django.core.management.base import BaseCommand, CommandError
 from optparse import make_option
 import os
+import socket
 import sys
+import re
+
+naiveip_re = r'^(?:(?P<addr>\d{1,3}(?:\.\d{1,3}){3}|\[[a-fA-F0-9:]+\]):)?(?P<port>\d+)$'
+DEFAULT_PORT = "8000"
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
+        make_option('--ipv6', '-6', action='store_true', dest='enable_ipv6', default=False,
+            help='Force the use of IPv6 address.'),
         make_option('--noreload', action='store_false', dest='use_reloader', default=True,
             help='Tells Django to NOT use the auto-reloader.'),
         make_option('--adminmedia', dest='admin_media_path', default='',
@@ -20,21 +27,32 @@ def handle(self, addrport='', *args, **options):
         import django
         from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
         from django.core.handlers.wsgi import WSGIHandler
+        enable_ipv6 = options.get('enable_ipv6')
+        if enable_ipv6 and not hasattr(socket, 'AF_INET6'):
+            raise CommandError("Your Python does not support IPv6.")
+
         if args:
             raise CommandError('Usage is runserver %s' % self.args)
         if not addrport:
             addr = ''
-            port = '8000'
+            port = DEFAULT_PORT
         else:
-            try:
-                addr, port = addrport.split(':')
-            except ValueError:
-                addr, port = '', addrport
-        if not addr:
-            addr = '127.0.0.1'
-
+            m = re.match(naiveip_re, addrport)
+            if m is None:
+                raise CommandError("%r is not a valid port number or address:port pair." % addrport)
+            addr, port = m.groups()
+            
         if not port.isdigit():
             raise CommandError("%r is not a valid port number." % port)
+        if addr:
+            if addr[0] == '[' and addr[-1] == ']':
+                enable_ipv6 = True
+                addr = addr[1:-1]
+            elif enable_ipv6:
+                 raise CommandError("IPv6 addresses must be surrounded with brackets")
+        if not addr:
+            addr = '127.0.0.1'
+            addr = (enable_ipv6 and '::1') or '127.0.0.1'
 
         use_reloader = options.get('use_reloader', True)
         admin_media_path = options.get('admin_media_path', '')
@@ -47,7 +65,8 @@ def inner_run():
             print "Validating models..."
             self.validate(display_num_errors=True)
             print "\nDjango version %s, using settings %r" % (django.get_version(), settings.SETTINGS_MODULE)
-            print "Development server is running at http://%s:%s/" % (addr, port)
+            fmt_addr = (enable_ipv6 and '[%s]' % addr) or addr
+            print "Development server is running at http://%s:%s/" % (fmt_addr, port)
             print "Quit the server with %s." % quit_command
 
             # django.core.management.base forces the locale to en-us. We should
@@ -57,7 +76,7 @@ def inner_run():
 
             try:
                 handler = AdminMediaHandler(WSGIHandler(), admin_media_path)
-                run(addr, int(port), handler)
+                run(addr, int(port), handler, enable_ipv6=enable_ipv6)
             except WSGIServerException, e:
                 # Use helpful error messages instead of ugly tracebacks.
                 ERRORS = {

v4.41/django/core/management/commands/testserver.py

@@ -7,6 +7,8 @@ class Command(BaseCommand):
         make_option('--addrport', action='store', dest='addrport',
             type='string', default='',
             help='port number or ipaddr:port to run the server on'),
+        make_option('--ipv6', '-6', action='store_true', dest='enable_ipv6', default=False,
+            help='Forces IPv6 support.'),
     )
     help = 'Runs a development server with data from the given fixture(s).'
     args = '[fixture ...]'
@@ -30,4 +32,4 @@ def handle(self, *fixture_labels, **options):
         # a strange error -- it causes this handle() method to be called
         # multiple times.
         shutdown_message = '\nServer stopped.\nNote that the test database, %r, has not been deleted. You can explore it on your own.' % db_name
-        call_command('runserver', addrport=addrport, shutdown_message=shutdown_message, use_reloader=False)
+        call_command('runserver', addrport=addrport, shutdown_message=shutdown_message, use_reloader=False, enable_ipv6=options['enable_ipv6'])

v4.41/django/core/servers/basehttp.py

@@ -11,6 +11,7 @@
 import mimetypes
 import os
 import re
+import socket
 import stat
 import sys
 import urllib
@@ -714,8 +715,12 @@ def __call__(self, environ, start_response):
         start_response(status, headers.items())
         return output
 
-def run(addr, port, wsgi_handler):
+class WSGIServerV6(WSGIServer):
+    address_family = socket.AF_INET6
+ 
+def run(addr, port, wsgi_handler, enable_ipv6=False):
     server_address = (addr, port)
-    httpd = WSGIServer(server_address, WSGIRequestHandler)
+    server_class = (enable_ipv6 and WSGIServerV6) or WSGIServer
+    httpd = server_class(server_address, WSGIRequestHandler)
     httpd.set_app(wsgi_handler)
     httpd.serve_forever()

v4.41/runserver

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-REMOTE_USER=admin ./manage runserver
+REMOTE_USER=admin ./manage runserver $*