Merge from stable-2.2

NEWS

@@ -116,6 +116,30 @@ installation with other effective versions (for example, the older Guile
 Notably, the `pkg-config' file is now `guile-3.0'.
 
 
+
+Changes in 2.2.6 (since 2.2.5):
+
+* Bug fixes
+
+** Fix regression introduced in 2.2.5 that would break HTTP servers
+
+Guile 2.2.5 introduced a bug that would break the built-in HTTP server
+provided by the (web server) module.  Specifically, HTTP servers would
+hang while reading requests.  See <https://bugs.gnu.org/36350>.
+
+** 'strftime' and 'strptime' honor the current locale encoding
+
+Until now these procedures would wrongfully assume that the locale
+encoding is always UTF-8.  See <https://bugs.gnu.org/35920>.
+
+** Re-export 'current-load-port'
+
+This procedure was erroneously removed in the 2.2 series but was still
+documented.
+
+** Minor documentation mistakes were fixed
+
+
 
 Changes in 2.2.5 (since 2.2.4):
 

module/system/repl/server.scm

@@ -211,7 +211,7 @@ and then close it.  Return the drained input as a string."
     (lambda ()
       ;; Enable full buffering mode on the socket to allow
       ;; 'get-bytevector-some' to return non-trivial chunks.
-      (setvbuf socket _IOFBF))
+      (setvbuf socket 'block))
     (lambda ()
       (let loop ((chunks '()))
         (let ((result (and (char-ready? socket)