Ticket #360: django-server-addr.2.diff

django/bin/django-admin.py

@@ -87 +87 @@
         ACTION_MAPPING[action](name, os.getcwd())
     elif action == 'runserver':
         if len(args) < 2:
+            addr = ''
             port = '8000'
         else:
-            port = args[1]
-        ACTION_MAPPING[action](port)
+            if args[1].find(':') != -1:
+                addr, port = args[1].split(':')
+            else:
+                addr = ''
+                port = args[1]
+        ACTION_MAPPING[action](addr, port)
     else:
         from django.core import meta
         if action == 'dbcheck':

django/core/servers/basehttp.py

@@ -636 +636 @@
         start_response(status, headers.items())
         return output
 
-def run(port, wsgi_handler):
-    server_address = ('', port)
+def run(addr, port, wsgi_handler):
+    server_address = (addr, port)
     httpd = WSGIServer(server_address, WSGIRequestHandler)
     httpd.set_app(wsgi_handler)
     httpd.serve_forever()

django/core/management.py

@@ -543 +543 @@
     print '%s error%s found.' % (num_errors, num_errors != 1 and 's' or '')
 validate.args = ''
 
-def runserver(port):
+def runserver(addr, port):
     "Starts a lightweight Web server for development."
     from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
     from django.core.handlers.wsgi import WSGIHandler
     if not port.isdigit():
         sys.stderr.write("Error: %r is not a valid port number.\n" % port)
         sys.exit(1)
+    if addr == '':
+        addr = '127.0.0.1'
     def inner_run():
         from django.conf.settings import SETTINGS_MODULE
         print "Validating models..."
         validate()
         print "\nStarting server on port %s with settings module %r." % (port, SETTINGS_MODULE)
-        print "Go to http://127.0.0.1:%s/ for Django." % port
+        print "Go to http://%s:%s/ for Django." % (addr, port)
         print "Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows)."
         try:
-            run(int(port), AdminMediaHandler(WSGIHandler()))
+            run(addr, int(port), AdminMediaHandler(WSGIHandler()))
         except WSGIServerException, e:
             # Use helpful error messages instead of ugly tracebacks.
             ERRORS = {