svn commit: r411385 - head/www/lighttpd/files

[Dirk Meyer]

Author: dinoex
Date: Sat Mar 19 09:38:14 2016
New Revision: 411385
URL: https://svnweb.freebsd.org/changeset/ports/411385

Log:
  - fix crashes with option MYSQLAUTH
  PR:		207555
  Approved by:	(maintiner timeout)

Modified:
  head/www/lighttpd/files/extra-patch-mysqlauth

Modified: head/www/lighttpd/files/extra-patch-mysqlauth
==============================================================================
--- head/www/lighttpd/files/extra-patch-mysqlauth	Sat Mar 19 09:37:08 2016	(r411384)
+++ head/www/lighttpd/files/extra-patch-mysqlauth	Sat Mar 19 09:38:14 2016	(r411385)
@@ -424,13 +424,16 @@ diff -Naur new/lighttpd-1.4.23/src/mod_a
  			} else {
  				log_error_write(srv, __FILE__, __LINE__, "sb", "auth.backend not supported:", s->auth_backend_conf);
  
-@@ -534,6 +637,28 @@
+@@ -534,6 +637,31 @@
  				return (ret);
  			break;
  		}
 +               case AUTH_BACKEND_MYSQL: {
 +                       int port = atoi(s->auth_mysql_port->ptr);
 +
++                       /* ignore if auth_mysql_socket is invalid */
++                       if (p->conf.auth_mysql_socket == NULL)
++                           return HANDLER_GO_ON;
 +                       if (p->conf.auth_mysql_socket->ptr != NULL)
 +                           if (0 == strcmp(s->auth_mysql_socket->ptr, "")) s->auth_mysql_socket->ptr = NULL;
 +