Changeset 1460

Timestamp:

11/27/2006 01:50:36 PM (22 months ago)

Author:

jan

Message:

fixed unix-domain socket support (fixes #912, patch from jakabosky)

- get the real address-length instead of the size of the struct-union
- fixes the connect()-error on BSDs
- enables unix:/... support

Location:

trunk/src

Files:

• mod_indexfile.c (modified) (1 diff)
• mod_proxy_core.c (modified) (5 diffs)
• mod_proxy_core_address.c (modified) (2 diffs)
• mod_proxy_core_address.h (modified) (1 diff)

trunk/src/mod_indexfile.c

@@ -206 +206 @@
                 /* fce is already set up a few lines above */
 
+                /* need to reset condition cache since uri.path changed. */
+                config_cond_cache_reset(srv, con);
+
                 return HANDLER_GO_ON;
         }

trunk/src/mod_proxy_core.c

@@ -448 +448 @@
 
         if (-1 == (fd = socket(con->address->addr.plain.sa_family, SOCK_STREAM, 0))) {
+                ERROR("socket failed: %s", strerror(errno));
+                return HANDLER_ERROR;
         }
 
@@ -456 +458 @@
         con->sock->type = IOSOCKET_TYPE_SOCKET;
 
-        if (-1 == connect(fd, &(con->address->addr.plain), sizeof(con->address->addr))) {
+        if (-1 == connect(fd, &(con->address->addr.plain), con->address->addrlen)) {
                 switch(errno) {
                 case EINPROGRESS:
@@ -466 +468 @@
                         con->sock->fd = -1;
 
+                        ERROR("connect failed: %s", strerror(errno));
                         return HANDLER_ERROR;
                 }
@@ -1190 +1193 @@
                 con->mode = p->id;
 
+                if (con->conf.log_request_handling) {
+                        ERROR("handling it in mod_proxy_core: uri.path=%s", BUF_STR(con->uri.path));
+                }
                 sess->remote_con = con;
         }
@@ -1561 +1567 @@
         p->set_defaults = mod_proxy_core_set_defaults;
         p->handle_physical         = mod_proxy_core_check_extension;
+        p->handle_start_backend = mod_proxy_core_check_extension;
         p->handle_send_request_content = mod_proxy_send_request_content;
         p->handle_read_response_content = mod_proxy_core_start_backend;

trunk/src/mod_proxy_core_address.c

@@ -98 +98 @@
         if (0 == strncmp(BUF_STR(name), "unix:", 5)) {
                 /* a unix domain socket */
+#ifdef HAVE_SYS_UN_H
+                proxy_address *a = proxy_address_init();
+
+                /* setup AF_UNIX sockaddr */
+                a->addr.un.sun_family = AF_UNIX;
+                strcpy(a->addr.un.sun_path, BUF_STR(name) + 5);
+                a->addrlen = sizeof(a->addr.un);
+/*
+#ifdef SUN_LEN
+                a->addrlen = SUN_LEN(&(a->addr.un));
+#else
+                a->addrlen = (name->used - 5) + sizeof(a->addr.un.sun_family);
+#endif
+*/
+
+                a->state = PROXY_ADDRESS_STATE_ACTIVE;
+                buffer_copy_string_buffer(a->name, name);
+
+                proxy_address_pool_add(address_pool, a);
+                return 0;
+#else
                 ERROR("unix: scheme is not supported for %s", BUF_STR(name));
                 return -1;
+#endif
         } else if (name->ptr[0] == '[') {
                 if (name->ptr[name->used - 1] == ']') {
@@ -152 +174 @@
 
                 memcpy(&(a->addr), cur->ai_addr, cur->ai_addrlen);
+                a->addrlen = cur->ai_addrlen;
 
                 a->state = PROXY_ADDRESS_STATE_ACTIVE;

trunk/src/mod_proxy_core_address.h

@@ -15 +15 @@
 typedef struct {
         sock_addr addr;
+        socklen_t addrlen;
 
         buffer *name; /* a inet_ntoa() prepresentation of the address */