- disable patch for files that didn't exist in 1.4.9 tarball

Changed files:
    branch.sh -> 1.5
    lighttpd-branch.diff -> 1.40

diff --git a/branch.sh b/branch.sh
index 540cf119dfad5346089cb7e06b18e574090ca478..f3c81e74f83f76590442f7d5a03e5559e83ad2ff 100644 (file)
--- a/branch.sh
+++ b/branch.sh
@@ -10,5 +10,5 @@ echo "Running diff: $old -> $new"
 LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff
 
 echo "Excluding files which change version or were not in dist tarball"
-filterdiff -x 'configure.in' -x .cvsignore lighttpd-branch.diff > lighttpd-branch.diff.tmp
+filterdiff -x 'configure.in' -x .cvsignore -x tests/mod-extforward.conf -x src/mod_uploadprogress.c lighttpd-branch.diff > lighttpd-branch.diff.tmp
 mv -f lighttpd-branch.diff.tmp lighttpd-branch.diff

diff --git a/lighttpd-branch.diff b/lighttpd-branch.diff
index 96af28930a0467556e5e6474dd37e25e4286ec34..8271adfd0e84f1e05b4306e9baa51959e69c79aa 100644 (file)
--- a/lighttpd-branch.diff
+++ b/lighttpd-branch.diff
@@ -4776,51 +4776,6 @@ Index: src/mod_indexfile.c
  
 Index: src/mod_uploadprogress.c
 ===================================================================
---- src/mod_uploadprogress.c   (.../tags/lighttpd-1.4.19)      (revision 2303)
-+++ src/mod_uploadprogress.c   (.../branches/lighttpd-1.4.x)   (revision 2303)
-@@ -355,6 +355,7 @@
-               con->file_finished = 1;
- 
-               con->http_status = 200;
-+              con->mode = DIRECT;
- 
-               /* get the connection */
-               if (NULL == (post_con = connection_map_get_connection(p->con_map, b))) {
-@@ -363,7 +364,7 @@
- 
-                       b = chunkqueue_get_append_buffer(con->write_queue);
- 
--                      BUFFER_APPEND_STRING_CONST(b, "starting");
-+                      buffer_append_string_len(b, CONST_STR_LEN("starting"));
- 
-                       return HANDLER_FINISHED;
-               }
-@@ -378,15 +379,18 @@
-               b = chunkqueue_get_append_buffer(con->write_queue);
- 
-               /* prepare XML */
--              BUFFER_COPY_STRING_CONST(b, "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>");
--              BUFFER_APPEND_STRING_CONST(b, "<upload>");
--              BUFFER_APPEND_STRING_CONST(b, "<size>");
-+              buffer_copy_string_len(b, CONST_STR_LEN(
-+                      "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>"
-+                      "<upload>"
-+                      "<size>"));
-               buffer_append_off_t(b, post_con->request.content_length);
--              BUFFER_APPEND_STRING_CONST(b, "</size>");
--              BUFFER_APPEND_STRING_CONST(b, "<received>");
-+              buffer_append_string_len(b, CONST_STR_LEN(
-+                      "</size>"
-+                      "<received>"));
-               buffer_append_off_t(b, post_con->request_content_queue->bytes_in);
--              BUFFER_APPEND_STRING_CONST(b, "</received>");
--              BUFFER_APPEND_STRING_CONST(b, "</upload>");
-+              buffer_append_string_len(b, CONST_STR_LEN(
-+                      "</received>"
-+                      "</upload>"));
- 
-               log_error_write(srv, __FILE__, __LINE__, "sb", "...", b);
- 
 Index: src/mod_fastcgi.c
 ===================================================================
 --- src/mod_fastcgi.c  (.../tags/lighttpd-1.4.19)      (revision 2303)
@@ -6208,16 +6163,6 @@ Index: tests/bug-06.conf
  server.port                 = 2048
 Index: tests/mod-extforward.conf
 ===================================================================
---- tests/mod-extforward.conf  (.../tags/lighttpd-1.4.19)      (revision 2303)
-+++ tests/mod-extforward.conf  (.../branches/lighttpd-1.4.x)   (revision 2303)
-@@ -3,7 +3,6 @@
- debug.log-request-header   = "disable"
- 
- server.document-root         = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
--server.pid-file              = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid"
- 
- ## bind to port (default: 80)
- server.port                 = 2048
 
 Property changes on: tests/symlink.t
 ___________________________________________________________________