Mercurial > hg > nginx
comparison src/core/ngx_inet.c @ 6534:19a54ba76c04
Removed a surplus condition from ngx_parse_inet6_url().
No functional changes, since the condition was always true.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 11 May 2016 17:55:30 +0300 |
parents | b358d670c654 |
children | adf25b8d0431 |
comparison
equal
deleted
inserted
replaced
6533:b358d670c654 | 6534:19a54ba76c04 |
---|---|
841 if (p == NULL) { | 841 if (p == NULL) { |
842 u->err = "invalid host"; | 842 u->err = "invalid host"; |
843 return NGX_ERROR; | 843 return NGX_ERROR; |
844 } | 844 } |
845 | 845 |
846 if (last - p) { | 846 port = p + 1; |
847 | 847 |
848 port = p + 1; | 848 uri = ngx_strlchr(port, last, '/'); |
849 | 849 |
850 uri = ngx_strlchr(port, last, '/'); | 850 if (uri) { |
851 | 851 if (u->listen || !u->uri_part) { |
852 if (uri) { | 852 u->err = "invalid host"; |
853 if (u->listen || !u->uri_part) { | 853 return NGX_ERROR; |
854 u->err = "invalid host"; | 854 } |
855 return NGX_ERROR; | 855 |
856 } | 856 u->uri.len = last - uri; |
857 | 857 u->uri.data = uri; |
858 u->uri.len = last - uri; | 858 |
859 u->uri.data = uri; | 859 last = uri; |
860 | 860 } |
861 last = uri; | 861 |
862 } | 862 if (port < last) { |
863 | 863 if (*port != ':') { |
864 if (port < last) { | 864 u->err = "invalid host"; |
865 if (*port != ':') { | 865 return NGX_ERROR; |
866 u->err = "invalid host"; | 866 } |
867 return NGX_ERROR; | 867 |
868 } | 868 port++; |
869 | 869 |
870 port++; | 870 len = last - port; |
871 | 871 |
872 len = last - port; | 872 n = ngx_atoi(port, len); |
873 | 873 |
874 n = ngx_atoi(port, len); | 874 if (n < 1 || n > 65535) { |
875 | 875 u->err = "invalid port"; |
876 if (n < 1 || n > 65535) { | 876 return NGX_ERROR; |
877 u->err = "invalid port"; | 877 } |
878 return NGX_ERROR; | 878 |
879 } | 879 u->port = (in_port_t) n; |
880 | 880 sin6->sin6_port = htons((in_port_t) n); |
881 u->port = (in_port_t) n; | 881 |
882 sin6->sin6_port = htons((in_port_t) n); | 882 u->port_text.len = len; |
883 | 883 u->port_text.data = port; |
884 u->port_text.len = len; | 884 |
885 u->port_text.data = port; | 885 } else { |
886 | 886 u->no_port = 1; |
887 } else { | 887 u->port = u->default_port; |
888 u->no_port = 1; | 888 sin6->sin6_port = htons(u->default_port); |
889 u->port = u->default_port; | |
890 sin6->sin6_port = htons(u->default_port); | |
891 } | |
892 } | 889 } |
893 | 890 |
894 len = p - host; | 891 len = p - host; |
895 | 892 |
896 if (len == 0) { | 893 if (len == 0) { |