fix testing code in web/server

* module/web/server.scm (call-with-encoded-output-string): Fix some code
  I accidentally left in while testing. Re-tested the difference in
  speed; pleasantly surprised.

* module/web/uri.scm: Make the same change here.

diff --git a/module/web/server.scm b/module/web/server.scm
index 3d7c411..6d3d941 100644 (file)
--- a/module/web/server.scm
+++ b/module/web/server.scm
@@ -152,9 +152,9 @@
      (values #f #f #f))))
 
 (define (call-with-encoded-output-string charset proc)
-  (if (and (string-ci=? charset "utf-8") #f)
+  (if (string-ci=? charset "utf-8")
       ;; I don't know why, but this appears to be faster; at least for
-      ;; examples/debug-sxml.scm (650 reqs/s versus 510 reqs/s).
+      ;; examples/debug-sxml.scm (1464 reqs/s versus 850 reqs/s).
       (string->utf8 (call-with-output-string proc))
       (call-with-values
           (lambda ()

diff --git a/module/web/uri.scm b/module/web/uri.scm
index 86b93d5..7a82f0f 100644 (file)
--- a/module/web/uri.scm
+++ b/module/web/uri.scm
@@ -218,9 +218,7 @@
 
 
 (define (call-with-encoded-output-string charset proc)
-  (if (and (string-ci=? charset "utf-8") #f)
-      ;; I don't know why, but this appears to be faster; at least for
-      ;; examples/debug-sxml.scm (650 reqs/s versus 510 reqs/s).
+  (if (string-ci=? charset "utf-8")
       (string->utf8 (call-with-output-string proc))
       (call-with-values
           (lambda ()