Hello community,
here is the log from the commit of package guile for openSUSE:Factory checked in at 2019-07-02 10:37:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guile (Old)
and /work/SRC/openSUSE:Factory/.guile.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile"
Tue Jul 2 10:37:19 2019 rev:57 rq:712657 version:2.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/guile/guile.changes 2019-02-04 21:21:23.947654235 +0100
+++ /work/SRC/openSUSE:Factory/.guile.new.4615/guile.changes 2019-07-02 10:37:21.814487565 +0200
@@ -1,0 +2,43 @@
+Tue Jun 25 08:02:58 UTC 2019 - Jonathan Brielmaier
From e1225d013ed8673382d6d8f9300dd6b175c8b820 Mon Sep 17 00:00:00 2001 From: Mark H Weaver
Date: Mon, 24 Jun 2019 10:24:28 -0400 Subject: Revert "web: Add support for HTTP header continuation lines."
Fixes https://bugs.gnu.org/36350. This reverts commit 73cde5ed7218a090ecee888870908af5445796f0. --- module/web/http.scm | 31 +++++++------------------------ test-suite/tests/web-http.test | 11 +---------- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/module/web/http.scm b/module/web/http.scm index f1ca733..de61c94 100644 --- a/module/web/http.scm +++ b/module/web/http.scm @@ -1,6 +1,6 @@ ;;; HTTP messages -;; Copyright (C) 2010-2017, 2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2017 Free Software Foundation, Inc. ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -152,35 +152,18 @@ The default writer will call ‘put-string’." (lambda (val port) (put-string port val))))) -(define spaces-and-tabs - (char-set #\space #\tab)) - -(define (space-or-tab? c) - (case c - ((#\space #\tab) #t) - (else #f))) - (define (read-header-line port) - "Read an HTTP header line, including any continuation lines, and -return the combined string without its final CRLF or LF. Raise a -'bad-header' exception if the line does not end in CRLF or LF, or if EOF -is reached." + "Read an HTTP header line and return it without its final CRLF or LF. +Raise a 'bad-header' exception if the line does not end in CRLF or LF, +or if EOF is reached." (match (%read-line port) (((? string? line) . #\newline) ;; '%read-line' does not consider #\return a delimiter; so if it's ;; there, remove it. We are more tolerant than the RFC in that we ;; tolerate LF-only endings. - (let ((line (if (string-suffix? "\r" line) - (string-drop-right line 1) - line))) - ;; If the next character is a space or tab, then there's at least - ;; one continuation line. Read the continuation lines by calling - ;; 'read-header-line' recursively, and append them to this header - ;; line, folding the leading spaces and tabs to a single space. - (if (space-or-tab? (lookahead-char port)) - (string-append line " " (string-trim (read-header-line port) - spaces-and-tabs)) - line))) + (if (string-suffix? "\r" line) + (string-drop-right line 1) + line)) ((line . _) ;EOF or missing delimiter (bad-header 'read-header-line line)))) diff --git a/test-suite/tests/web-http.test b/test-suite/tests/web-http.test index c1cf088..6337734 100644 --- a/test-suite/tests/web-http.test +++ b/test-suite/tests/web-http.test @@ -1,6 +1,6 @@ ;;;; web-http.test --- HTTP library -*- mode: scheme; coding: utf-8; -*- ;;;; -;;;; Copyright (C) 2010-2011, 2014-2017, 2019 Free Software Foundation, Inc. +;;;; Copyright (C) 2010-2011, 2014-2017 Free Software Foundation, Inc. ;;;; ;;;; This library is free software; you can redistribute it and/or ;;;; modify it under the terms of the GNU Lesser General Public @@ -242,15 +242,6 @@ (pass-if-round-trip "Cache-Control: acme-cache-extension=100 quux\r\n") (pass-if-round-trip "Cache-Control: acme-cache-extension=\"100, quux\"\r\n") - (let ((str "Cache-Control: acme-cache-extension=\"100,\r\n\t foo,\r\n quux\"\r\n") - (val '(cache-control . ((acme-cache-extension . "100, foo, quux"))))) - (pass-if-equal "continuation lines" - val - (call-with-values (lambda () - (read-header (open-input-string str))) - (lambda (sym val) - (cons sym val))))) - (pass-if-parse connection "close" '(close)) (pass-if-parse connection "Content-Encoding" '(content-encoding)) -- cgit v1.0-41-gc330