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

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2007-08-18 08:29:00 +0000 (Sat, 18 Aug 2007)
New Revision: 259

Added:
   lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/patches/00list
Log:
* debian/control: Drop conflict with gamin as it appears it was not the
  issue. (Closes: #438058).
* src/mod_mysql_vhost.c: Enable mysql auto-connect mode, as it's not default
  in mysql 5.x anymore. (Closes: #428677).



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2007-08-15 07:51:27 UTC (rev 258)
+++ lighttpd/trunk/debian/changelog	2007-08-18 08:29:00 UTC (rev 259)
@@ -1,3 +1,12 @@
+lighttpd (1.4.16-4) unstable; urgency=low
+
+  * debian/control: Drop conflict with gamin as it appears it was not the
+    issue. (Closes: #438058).
+  * src/mod_mysql_vhost.c: Enable mysql auto-connect mode, as it's not default
+    in mysql 5.x anymore. (Closes: #428677).
+
+ -- Pierre Habouzit <madcoder at debian.org>  Sat, 18 Aug 2007 10:27:22 +0200
+
 lighttpd (1.4.16-3) unstable; urgency=high
 
   * Urgency set to high due to RC bug fix.

Modified: lighttpd/trunk/debian/patches/00list
===================================================================
--- lighttpd/trunk/debian/patches/00list	2007-08-15 07:51:27 UTC (rev 258)
+++ lighttpd/trunk/debian/patches/00list	2007-08-18 08:29:00 UTC (rev 259)
@@ -1,3 +1,4 @@
 02_fastcgi_detach.dpatch
 03_ldap_leak_bugfix.dpatch
 04_ldap_build_filter_fix.dpatch
+05_mysql_autoreconnect.dpatch

Added: lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch
===================================================================
--- lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch	                        (rev 0)
+++ lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch	2007-08-18 08:29:00 UTC (rev 259)
@@ -0,0 +1,20 @@
+#! /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)) {


Property changes on: lighttpd/trunk/debian/patches/05_mysql_autoreconnect.dpatch
___________________________________________________________________
Name: svn:executable
   + *