[pkg-lighttpd] r271 - in lighttpd/trunk/debian: . patches

[eloy at alioth.debian.org]

Author: eloy
Date: 2007-09-04 10:26:35 +0000 (Tue, 04 Sep 2007)
New Revision: 271

Removed:
   lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/patches/00list
Log:
dropped patch 05


Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2007-09-04 10:21:29 UTC (rev 270)
+++ lighttpd/trunk/debian/changelog	2007-09-04 10:26:35 UTC (rev 271)
@@ -1,6 +1,7 @@
 lighttpd (1.4.17-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
+  * patches/05_mysql_autoreconnect.dpatch - dropped, fixed in upstream
 
  -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Tue, 04 Sep 2007 12:19:01 +0200
 

Modified: lighttpd/trunk/debian/patches/00list
===================================================================
--- lighttpd/trunk/debian/patches/00list	2007-09-04 10:21:29 UTC (rev 270)
+++ lighttpd/trunk/debian/patches/00list	2007-09-04 10:26:35 UTC (rev 271)
@@ -1,4 +1,4 @@
 02_fastcgi_detach.dpatch
 03_ldap_leak_bugfix.dpatch
 04_ldap_build_filter_fix.dpatch
-05_mysql_autoreconnect.dpatch
+

Deleted: lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch
===================================================================
--- lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch	2007-09-04 10:21:29 UTC (rev 270)
+++ lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch	2007-09-04 10:26:35 UTC (rev 271)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_mysql_autoreconnect.dpatch by Pierre Habouzit <madcoder at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad pkg~/src/mod_mysql_vhost.c pkg/src/mod_mysql_vhost.c
---- pkg~/src/mod_mysql_vhost.c	2007-07-20 11:43:29.000000000 +0200
-+++ pkg/src/mod_mysql_vhost.c	2007-08-18 10:26:36.000000000 +0200
-@@ -253,6 +253,9 @@
- 				return HANDLER_ERROR;
- 			}
- #define FOO(x) (s->x->used ? s->x->ptr : NULL)
-+			/* http://trac.lighttpd.net/trac/ticket/518 */
-+			my_bool reconnect = 1;
-+			mysql_options(s->mysql, MYSQL_OPT_RECONNECT, &reconnect);
- 
- 			if (!mysql_real_connect(s->mysql, FOO(hostname), FOO(myuser), FOO(mypass),
- 						FOO(mydb), s->port, FOO(mysock), 0)) {