equal
deleted
inserted
replaced
75 if self.httpd.prefix: |
75 if self.httpd.prefix: |
76 prefix = self.httpd.prefix.strip(b'/') + b'/' |
76 prefix = self.httpd.prefix.strip(b'/') + b'/' |
77 else: |
77 else: |
78 prefix = b'' |
78 prefix = b'' |
79 |
79 |
80 port = r':%d' % self.httpd.port |
80 port = ':%d' % self.httpd.port |
81 if port == r':80': |
81 if port == ':80': |
82 port = r'' |
82 port = '' |
83 |
83 |
84 bindaddr = self.httpd.addr |
84 bindaddr = self.httpd.addr |
85 if bindaddr == r'0.0.0.0': |
85 if bindaddr == '0.0.0.0': |
86 bindaddr = r'*' |
86 bindaddr = '*' |
87 elif r':' in bindaddr: # IPv6 |
87 elif ':' in bindaddr: # IPv6 |
88 bindaddr = r'[%s]' % bindaddr |
88 bindaddr = '[%s]' % bindaddr |
89 |
89 |
90 fqaddr = self.httpd.fqaddr |
90 fqaddr = self.httpd.fqaddr |
91 if r':' in fqaddr: |
91 if ':' in fqaddr: |
92 fqaddr = r'[%s]' % fqaddr |
92 fqaddr = '[%s]' % fqaddr |
93 |
93 |
94 url = b'http://%s%s/%s' % ( |
94 url = b'http://%s%s/%s' % ( |
95 pycompat.sysbytes(fqaddr), |
95 pycompat.sysbytes(fqaddr), |
96 pycompat.sysbytes(port), |
96 pycompat.sysbytes(port), |
97 prefix, |
97 prefix, |