[nginx] svn commit: r4715 - in branches/stable-1.2: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 15:33:35 +0000 (Mon, 02 Jul 2012)
New Revision: 4715
URL: http://trac.nginx.org/nginx/changeset/4715/nginx

Log:
Merge of r4643:

Removed historical and now redundant syntax pre-checks in ngx_parse_url().


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/core/ngx_inet.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 14:42:08 UTC (rev 4714)
+++ branches/stable-1.2	2012-07-02 15:33:35 UTC (rev 4715)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4642,4645,4674-4676
+/trunk:4611-4632,4636-4643,4645,4674-4676
\ No newline at end of property
Modified: branches/stable-1.2/src/core/ngx_inet.c
===================================================================
--- branches/stable-1.2/src/core/ngx_inet.c	2012-07-02 14:42:08 UTC (rev 4714)
+++ branches/stable-1.2/src/core/ngx_inet.c	2012-07-02 15:33:35 UTC (rev 4715)
@@ -522,11 +522,6 @@
         return ngx_parse_unix_domain_url(pool, u);
     }
 
-    if ((p[0] == ':' || p[0] == '/') && !u->listen) {
-        u->err = "invalid host";
-        return NGX_ERROR;
-    }
-
     if (p[0] == '[') {
         return ngx_parse_inet6_url(pool, u);
     }