~ubuntu-branches/debian/stretch/haproxy/stretch

« back to all changes in this revision

Viewing changes to debian/patches/debianize-dconv.patch

  • Committer: Package Import Robot
  • Author(s): Vincent Bernat
  • Date: 2015-05-02 16:38:28 UTC
  • mfrom: (1.3.13)
  • Revision ID: package-import@ubuntu.com-20150502163828-lph2toctaqrw41x5
Tags: 1.5.12-1
* New upstream stable release including the following fixes:
  - BUG/MAJOR: http: don't read past buffer's end in http_replace_value
  - BUG/MAJOR: http: prevent risk of reading past end with balance
               url_param
  - BUG/MEDIUM: Do not consider an agent check as failed on L7 error
  - BUG/MEDIUM: patern: some entries are not deleted with case
                insensitive match
  - BUG/MEDIUM: buffer: one byte miss in buffer free space check
  - BUG/MEDIUM: http: thefunction "(req|res)-replace-value" doesn't
                respect the HTTP syntax
  - BUG/MEDIUM: peers: correctly configure the client timeout
  - BUG/MEDIUM: http: hdr_cnt would not count any header when called
                without name
  - BUG/MEDIUM: listener: don't report an error when resuming unbound
                listeners
  - BUG/MEDIUM: init: don't limit cpu-map to the first 32 processes only
  - BUG/MEDIUM: stream-int: always reset si->ops when si->end is
                nullified
  - BUG/MEDIUM: http: remove content-length from chunked messages
  - BUG/MEDIUM: http: do not restrict parsing of transfer-encoding to
                HTTP/1.1
  - BUG/MEDIUM: http: incorrect transfer-coding in the request is a bad
                request
  - BUG/MEDIUM: http: remove content-length form responses with bad
                transfer-encoding
  - BUG/MEDIUM: http: wait for the exact amount of body bytes in
                wait_for_request_body

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Author: Apollon Oikonomopoulos <apoikos@debian.org>
2
 
Date:   Sun Apr 27 11:56:44 2014 +0300
 
1
From 90b0c858804a61a34e2c2ff82eaeea89561792e3 Mon Sep 17 00:00:00 2001
 
2
From: Apollon Oikonomopoulos <apoikos@debian.org>
 
3
Date: Wed, 29 Apr 2015 13:51:49 +0300
 
4
Subject: [PATCH] dconv: debianize
3
5
 
4
 
    dconv: debianize
5
 
    
6
 
     - Use Debian bootstrap and jquery packages
7
 
     - Add Debian-related resources to the template
8
 
     - Use the package's version instead of HAProxy's git version
9
 
     - Move all assets under static/
 
6
 - Use Debian bootstrap and jquery packages
 
7
 - Add Debian-related resources to the template
 
8
 - Use the package's version instead of HAProxy's git version
 
9
 - Move all assets under static/
 
10
 - Strip the conversion date from the output to ensure reproducible
 
11
   build.
 
12
---
 
13
 debian/dconv/haproxy-dconv.py               | 20 +++++++------
 
14
 debian/dconv/templates/parser/table/row.tpl |  6 ++--
 
15
 debian/dconv/templates/template.html        | 44 +++++++++--------------------
 
16
 3 files changed, 27 insertions(+), 43 deletions(-)
10
17
 
11
18
diff --git a/debian/dconv/haproxy-dconv.py b/debian/dconv/haproxy-dconv.py
12
19
index a43907c..3185b94 100755
93
100
         style = "class=\"pagination-centered\""
94
101
         data = '&nbsp;'
95
102
diff --git a/debian/dconv/templates/template.html b/debian/dconv/templates/template.html
96
 
index 21e6ff2..abf5488 100644
 
103
index 21e6ff2..9372808 100644
97
104
--- a/debian/dconv/templates/template.html
98
105
+++ b/debian/dconv/templates/template.html
99
106
@@ -3,44 +3,27 @@
155
162
                                </p>
156
163
                                <p class="text-right">
157
164
-                                       <small>Converted with <a href="http://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>${version}</b> on <b>${date}</b></small>
158
 
+                                       <small>Converted with <a href="http://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> on <b>${date}</b></small>
 
165
+                                       <small>Converted with <a href="http://github.com/cbonte/haproxy-dconv">haproxy-dconv</a></small>
159
166
                                </p>
160
167
                        </div>
161
168
                </div>
181
188
 
182
189
                <script>
183
190
                        /* Keyword search */
 
191
-- 
 
192
2.1.4
 
193