Changeset 47 in code for trunk/morty.go

Timestamp:

Nov 28, 2016, 8:34:53 PM (9 years ago)

Author:

asciimoo

Message:

Merge pull request #36 from dalf/head

svg, math, link and meta tags

File:

• trunk/morty.go (modified) (3 diffs)

trunk/morty.go

@@ -203 +203 @@
         req.SetConnectionClose()
 
-        reqQuery := parsedURI.Query()
-        ctx.QueryArgs().VisitAll(func(key, value []byte) {
-                reqQuery.Add(string(key), string(value))
-        })
-
-        parsedURI.RawQuery = reqQuery.Encode()
-
-        uriStr := parsedURI.String()
-
-        log.Println("getting", uriStr)
-
-        req.SetRequestURI(uriStr)
+        requestURIStr := string(requestURI)
+
+        log.Println("getting", requestURIStr)
+
+        req.SetRequestURI(requestURIStr)
         req.Header.SetUserAgentBytes([]byte("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36"))
 
@@ -253 +246 @@
                         }
                 }
-                error_message := fmt.Sprintf("invalid response: %d", resp.StatusCode())
+                error_message := fmt.Sprintf("invalid response: %d (%s)", resp.StatusCode(), requestURIStr)
                 p.serveMainPage(ctx, resp.StatusCode(), errors.New(error_message))
                 return
@@ -652 +645 @@
                 return fmt.Sprintf("./?mortyurl=%s", url.QueryEscape(uri)), nil
         }
+
         return fmt.Sprintf("./?mortyhash=%s&mortyurl=%s", hash(uri, rc.Key), url.QueryEscape(uri)), nil
 }