Changeset 480

Timestamp:

07/28/2005 08:55:55 PM (3 years ago)

Author:

jan

Message:

added support for host and port

Files:

• branches/lighttpd-1.3.x/src/mod_mysql_vhost.c (modified) (13 diffs)

branches/lighttpd-1.3.x/src/mod_mysql_vhost.c

@@ -29 +29 @@
  */
 
+#ifdef HAVE_MYSQL
 typedef struct {
-#ifdef HAVE_MYSQL
         MYSQL   *mysql;
-#endif
+        
         buffer  *mydb;
         buffer  *myuser;
         buffer  *mypass;
         buffer  *mysock;
+        
+        buffer  *hostname;
+        unsigned short port;
         
         buffer  *mysql_pre;
@@ -88 +91 @@
                 for (i = 0; i < srv->config_context->used; i++) {
                         plugin_config *s = p->config_storage[i];
-#ifdef HAVE_MYSQL
+                        
                         mysql_close(s->mysql);
-#endif
+                        
                         buffer_free(s->mydb);
                         buffer_free(s->myuser);
@@ -166 +169 @@
 
         config_values_t cv[] = {
-                { "mysql-vhost.db",     NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },        
+                { "mysql-vhost.db",     NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },
                 { "mysql-vhost.user",   NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },
-                { "mysql-vhost.pass",   NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },        
-                { "mysql-vhost.sock",   NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },        
-                { "mysql-vhost.sql",    NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },        
+                { "mysql-vhost.pass",   NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },
+                { "mysql-vhost.sock",   NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },
+                { "mysql-vhost.sql",    NULL, T_CONFIG_STRING,  T_CONFIG_SCOPE_SERVER },
+                { "mysql-vhost.hostname", NULL, T_CONFIG_STRING,T_CONFIG_SCOPE_SERVER },
+                { "mysql-vhost.port",   NULL, T_CONFIG_SHORT,   T_CONFIG_SCOPE_SERVER },
                 { NULL,                 NULL, T_CONFIG_UNSET,   T_CONFIG_SCOPE_UNSET }
         };
@@ -186 +191 @@
                 s->mypass = buffer_init();
                 s->mysock = buffer_init();
+                s->hostname = buffer_init();
+                s->port   = 0;               /* default port for mysql */
                 sel = buffer_init();
-#ifdef HAVE_MYSQL
                 s->mysql = NULL;
-#endif
                 
                 s->mysql_pre = buffer_init();
@@ -199 +204 @@
                 cv[3].destination = s->mysock;
                 cv[4].destination = sel;
+                cv[5].destination = s->hostname;
+                cv[6].destination = &(s->port);
                 
                 p->config_storage[i] = s;
@@ -217 +224 @@
                 }
                 
+                /* required:
+                 * - username
+                 * - database 
+                 * 
+                 * optional:
+                 * - password, default: empty
+                 * - socket, default: mysql default
+                 * - hostname, if set overrides socket
+                 * - port, default: 3306
+                 */
+                
                 /* all have to be set */
                 if (!(buffer_is_empty(s->myuser) ||
-                      buffer_is_empty(s->mypass) ||
-                      buffer_is_empty(s->mydb) ||
-                      buffer_is_empty(s->mysock))) {
-#ifdef HAVE_MYSQL
+                      buffer_is_empty(s->mydb))) {
+
                         int fd;
                 
@@ -230 +246 @@
                                 return HANDLER_ERROR;
                         }
+#define FOO(x) (s->x->used ? s->x->ptr : NULL)
                         
-                        if (!mysql_real_connect(s->mysql, NULL, s->myuser->ptr, s->mypass->ptr, 
-                                                s->mydb->ptr, 0, s->mysock->ptr, 0)) {
+                        if (!mysql_real_connect(s->mysql, FOO(hostname), FOO(myuser), FOO(mypass), 
+                                                FOO(mydb), s->port, FOO(mysock), 0)) {
                                 log_error_write(srv, __FILE__, __LINE__, "s", mysql_error(s->mysql));
                                 
                                 return HANDLER_ERROR;
                         }
-                
+#undef FOO
                         /* set close_on_exec for mysql the hard way */
                         /* Note: this only works as it is done during startup, */
@@ -245 +262 @@
                                 fcntl(fd-1, F_SETFD, FD_CLOEXEC); 
                         }
-#endif
                 }
         }
@@ -280 +296 @@
                 }
                 
-#ifdef HAVE_MYSQL
                 if (s->mysql) {
                         PATCH(mysql);
                 }
-#endif
         }
         
@@ -298 +312 @@
         PATCH(mysql_pre);
         PATCH(mysql_post);
-#ifdef HAVE_MYSQL
         PATCH(mysql);
-#endif
         
         return 0;
@@ -309 +321 @@
 /* handle document root request */
 CONNECTION_FUNC(mod_mysql_vhost_handle_docroot) {
-#ifdef HAVE_MYSQL
         plugin_data *p = p_d;
         plugin_connection_data *c;
@@ -400 +411 @@
         con->http_status = 500; /* Internal Error */
         return HANDLER_FINISHED;
-#else
-        UNUSED(srv);
-        UNUSED(con);
-        UNUSED(p_d);
-        
-        return HANDLER_ERROR;
-#endif
 }
 
@@ -423 +427 @@
         return 0;
 }
-
+#else
+/* we don't have mysql support, this plugin does nothing */
+int mod_mysql_vhost_plugin_init(plugin *p) {
+        p->version     = LIGHTTPD_VERSION_ID;
+        p->name                         = buffer_init_string("mysql_vhost");
+
+        return 0;
+}
+#endif