dandri/dns-over-https
1
0
Fork 0
mirror of https://github.com/m13253/dns-over-https.git synced 2026-03-30 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take User-Agent out of common library, that would be better for packaging

Browse Source
This commit is contained in:
Star Brilliant
2018-04-24 14:25:33 +08:00
parent 12df47f45f
commit f4516429ee
6 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@@ -4,6 +4,10 @@ This Changelog records major changes between versions.
Not all changes are recorded. Please check git log for details.
## Version 1.3.3
- Take User-Agent out of common library, that would be better for packaging
## Version 1.3.2
- Fix version string in HTTP User-Agent

2
doh-client/google.go
View File

@@ -92,7 +92,7 @@ func (c *Client) generateRequestGoogle(w dns.ResponseWriter, r *dns.Msg, isTCP b
}
}
req.Header.Set("Accept", "application/json, application/dns-message, application/dns-udpwireformat")
req.Header.Set("User-Agent", jsonDNS.USER_AGENT)
req.Header.Set("User-Agent", USER_AGENT)
c.httpClientMux.RLock()
resp, err := c.httpClient.Do(req)
c.httpClientMux.RUnlock()

2
doh-client/ietf.go
View File

@@ -154,7 +154,7 @@ func (c *Client) generateRequestIETF(w dns.ResponseWriter, r *dns.Msg, isTCP boo
req.Header.Set("Content-Type", "application/dns-message")
}
req.Header.Set("Accept", "application/dns-message, application/dns-udpwireformat, application/json")
req.Header.Set("User-Agent", jsonDNS.USER_AGENT)
req.Header.Set("User-Agent", USER_AGENT)
c.httpClientMux.RLock()
resp, err := c.httpClient.Do(req)
c.httpClientMux.RUnlock()

4
json-dns/version.go → doh-client/version.go
View File

@@ -21,7 +21,7 @@
DEALINGS IN THE SOFTWARE.
*/
package jsonDNS
package main
const VERSION = "1.3.2"
const VERSION = "1.3.3"
const USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"

4
doh-server/server.go
View File

@@ -102,8 +102,8 @@ func (s *Server) Start() error {
}
func (s *Server) handlerFunc(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Server", jsonDNS.USER_AGENT)
w.Header().Set("X-Powered-By", jsonDNS.USER_AGENT)
w.Header().Set("Server", USER_AGENT)
w.Header().Set("X-Powered-By", USER_AGENT)
if r.Form == nil {
const maxMemory = 32 << 20 // 32 MB

27
doh-server/version.go Normal file
View File

@@ -0,0 +1,27 @@
/*
DNS-over-HTTPS
Copyright (C) 2017-2018 Star Brilliant <m13253@hotmail.com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
package main
const VERSION = "1.3.3"
const USER_AGENT = "DNS-over-HTTPS/" + VERSION + " (+https://github.com/m13253/dns-over-https)"