Changeset 379

Timestamp:

08/31/06 20:28:05 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/cherokee/Makefile.am (modified) (3 diffs)
• cherokee/trunk/cherokee/balancer.h (modified) (1 diff)
• cherokee/trunk/cherokee/balancer_round_robin.c (added)
• cherokee/trunk/cherokee/balancer_round_robin.h (added)
• cherokee/trunk/cherokee/connection.c (modified) (2 diffs)
• cherokee/trunk/cherokee/handler.h (modified) (1 diff)
• cherokee/trunk/cherokee/handler_error_redir.c (modified) (2 diffs)
• cherokee/trunk/cherokee/module.h (modified) (1 diff)
• cherokee/trunk/cherokee/util.c (modified) (1 diff)
• cherokee/trunk/cherokee/util.h (modified) (3 diffs)
• cherokee/trunk/configure.in (modified) (3 diffs)
• cherokee/trunk/m4/Makefile.am (modified) (1 diff)
• cherokee/trunk/m4/pwd_grp.m4 (added)

cherokee/trunk/cherokee/Makefile.am

@@ -544 +544 @@
-else
-dynamic_validator_htdigest_lib = libplugin_htdigest.la
+endif
+
+
+#
+# Balancer Round Robin
+#
+balancer_round_robin = \
+balancer_round_robin.c \
+balancer_round_robin.h
+
+libplugin_round_robin_la_LDFLAGS = $(module_ldflags) 
+libplugin_round_robin_la_SOURCES = $(balancer_round_robin)
+
+if STATIC_BALANCER_ROUND_ROBIN
+static_balancer_round_robin_src = $(balancer_round_robin)
+else
+dynamic_balancer_round_robin_lib = libplugin_round_robin.la
-endif
-
@@ -764 +781 @@
-$(static_validator_htpasswd_src) \
-\
+$(static_balancer_round_robin_src) \
+\
-$(common_cgi) \
-\
@@ -886 +905 @@
-$(dynamic_validator_plain_lib) \
-$(dynamic_validator_htdigest_lib) \
-
+
+
-
-

cherokee/trunk/cherokee/balancer.h

@@ -44 +44 @@
-
-
+/* Handler properties
+ */
+typedef ret_t (* balancer_props_func_free_t)  (void  *balancerp);
+
+typedef struct {
+        balancer_props_func_free_t free;
+} cherokee_balancer_props_t;
+
+
-/* Balancer
- */

cherokee/trunk/cherokee/connection.c

@@ -1161 +1161 @@
-cherokee_connection_build_local_directory_userdir (cherokee_connection_t *conn, cherokee_virtual_server_t *vsrv, cherokee_config_entry_t *entry)
-{
-
+
+
+
-
-        /* Has a defined DocumentRoot
@@ -1182 +1184 @@
-        /* Default: it is inside the UserDir in home
-         */
-pwd = (struct passwd *) getpwnam (conn->userdir.buf
-pwd == NULL) || (pwd->
+ret = cherokee_getpwnam (conn->userdir.buf, &pwd, tmp, 1024
+ret != ret_ok) || (pwd.
-                conn->error_code = http_not_found;
-                return ret_error;
-        }
-
+
-        /* Build the local_directory:
-         */
-->pw_dir, strlen(pwd->
- (&conn->local_directory, "/", 1
+.pw_dir, strlen(pwd.
+_str (&conn->local_directory, "/"
-        cherokee_buffer_add_buffer (&conn->local_directory, &vsrv->userdir);
-

cherokee/trunk/cherokee/handler.h

@@ -60 +60 @@
-
-typedef struct {
-  
+
-} cherokee_handler_props_t;
-

cherokee/trunk/cherokee/handler_error_redir.c

@@ -102 +102 @@
-
-ret_t 
-nt
+onn
-{
-        list_t *i;
@@ -109 +109 @@
-                error_entry_t *entry = (error_entry_t *)i;
-                
-nt
+onn
-                        continue;
-
-nt
-nt
+onn
+onn
-                
-nt
-nt
+onn
+onn
-        }
-        

cherokee/trunk/cherokee/module.h

@@ -44 +44 @@
-        cherokee_handler   = 1 << 2,
-        cherokee_encoder   = 1 << 3,
-
+
+
-} cherokee_module_type_t;
-

cherokee/trunk/cherokee/util.c

@@ -1080 +1080 @@
-        return ret_ok;
-}
+
+
+
+#if defined(HAVE_PTHREAD) && !defined(HAVE_GETPWNAM_R)
+static pthread_mutex_t __global_getpwnam_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+ret_t 
+cherokee_getpwnam (const char *name, struct passwd *pwbuf, char *buf, size_t buflen)
+{
+#ifndef HAVE_GETPWNAM_R
+        size_t         pw_name_len   = 0;
+        size_t         pw_passwd_len = 0;
+        size_t         pw_gecos_len  = 0;
+        size_t         pw_dir_len    = 0;
+        size_t         pw_shell_len  = 0;
+        char          *ptr;
+        struct passwd *tmp;
+
+        CHEROKEE_MUTEX_LOCK (&__global_getpwnam_mutex);
+        
+        tmp = getpwnam (name);
+        if (tmp == NULL) 
+                return ret_error;
+
+        if (tmp->pw_name)   pw_name_len   = strlen(tmp->pw_name);
+        if (tmp->pw_passwd) pw_passwd_len = strlen(tmp->pw_passwd);
+        if (tmp->pw_gecos)  pw_gecos_len  = strlen(tmp->pw_gecos);
+        if (tmp->pw_dir)    pw_dir_len    = strlen(tmp->pw_dir);
+        if (tmp->pw_shell)  pw_shell_len  = strlen(tmp->pw_shell);
+
+        if ((pw_name_len + pw_passwd_len + 
+             pw_gecos_len + pw_dir_len + pw_shell_len) > buflen)
+                return ret_error;
+
+        memset (buf, 0, buflen);
+        ptr = buf;
+
+        pwbuf->pw_uid = tmp->pw_uid;
+        pwbuf->pw_gid = tmp->pw_gid;
+
+        if (tmp->pw_dir) {
+                memcpy (ptr, tmp->pw_dir, pw_dir_len);
+                pwbuf->pw_dir = ptr;
+                ptr += pw_dir_len + 1;
+        }
+
+        if (tmp->pw_passwd) {
+                memcpy (ptr, tmp->pw_passwd, pw_passwd_len);
+                pwbuf->pw_passwd = ptr;
+                ptr += pw_passwd_len + 1;
+        }
+
+        if (tmp->pw_name) {
+                memcpy (ptr, tmp->pw_name, pw_name_len);
+                pwbuf->pw_name = ptr;
+                ptr += pw_name_len + 1;
+        }
+
+        if (tmp->pw_gecos) {
+                memcpy (ptr, tmp->pw_gecos, pw_gecos_len);
+                pwbuf->pw_gecos = ptr;
+                ptr += pw_gecos_len + 1;
+        }
+
+        if (tmp->pw_shell) {
+                memcpy (ptr, tmp->pw_shell, pw_shell_len);
+                pwbuf->pw_shell = ptr;
+                ptr += pw_shell_len + 1;
+        }
+
+        CHEROKEE_MUTEX_UNLOCK (&__global_getpwnam_mutex);
+        return ret_ok;
+
+#elif HAVE_GETPWNAM_R_5
+        int            re;
+        struct passwd *tmp;
+
+        re = getpwnam_r (name, pwbuf, buf, buflen, &tmp);
+        if (re != 0) return ret_error;
+
+        return ret_ok;
+
+#elif HAVE_GETPWNAM_R_4
+        int re;
+
+        re = getpwnam_r (name, pwbuf, buf, buflen);
+        if (re != 0) return ret_error;
+
+        return ret_ok;
+#endif
+
+        return ret_no_sys;
+}
+
+
+#if defined(HAVE_PTHREAD) && !defined(HAVE_GETGRNAM_R)
+static pthread_mutex_t __global_getgrnam_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+ret_t 
+cherokee_getgrnam (const char *name, struct group *grbuf, char *buf, size_t buflen)
+{
+#ifndef HAVE_GETGRNAM_R
+        size_t        gr_name_len   = 0;
+        size_t        gr_passwd_len = 0;
+        char         *ptr;
+        struct group *tmp;
+
+        CHEROKEE_MUTEX_LOCK (&__global_getgrnam_mutex);
+
+        tmp = getgrnam (name);
+        if (tmp == NULL) 
+                return ret_error;
+
+        if (tmp->gr_name)   gr_name_len   = strlen(tmp->gr_name);
+        if (tmp->gr_passwd) gr_passwd_len = strlen(tmp->gr_passwd);
+
+        if ((gr_name_len + gr_passwd_len) > buflen)
+                return ret_error;
+
+        memset (buf, 0, buflen);
+        ptr = buf;
+
+        grbuf->gr_gid = tmp->gr_gid;
+
+        if (tmp->gr_name) {
+                memcpy (ptr, tmp->gr_name, gr_name_len);
+                grbuf->gr_name = ptr;
+                ptr += gr_name_len + 1;
+        }
+
+        if (tmp->gr_passwd) {
+                memcpy (ptr, tmp->gr_passwd, gr_passwd_len);
+                grbuf->gr_passwd = ptr;
+                ptr += gr_passwd_len + 1;
+        }
+
+        // TODO: Duplicate char **tmp->gr_mem
+
+        CHEROKEE_MUTEX_UNLOCK (&__global_getgrnam_mutex);
+        return ret_ok;
+
+#elif HAVE_GETGRNAM_R_5
+        int           re;
+        struct group *tmp;
+
+        re = getgrnam_r (name, grbuf, buf, buflen, &tmp);
+        if (re != 0) return ret_error;
+
+        return ret_ok;
+
+#elif HAVE_GETGRNAM_R_4
+        int re;
+
+        re = getgrnam_r (name, grbuf, buf, buflen);
+        if (re != 0) return ret_error;
+
+        return ret_ok;
+#endif
+
+        return ret_no_sys;
+}

cherokee/trunk/cherokee/util.h

@@ -41 +41 @@
-#endif 
-
+#include <pwd.h>
+#include <grp.h>
+
-#include <time.h>
-#include <dirent.h>
@@ -77 +80 @@
-/* Time management functions
- */
-
-struct tm *cherokee_gmtime           (const time_t *timep, struct tm *result);
-struct tm *cherokee_localtime        (const time_t *timep, struct tm *result);
@@ -87 +89 @@
-ret_t cherokee_gethostbyname (const char *hostname, void *addr);
-ret_t cherokee_syslog        (int priority, cherokee_buffer_t *buf);
+ret_t cherokee_getpwnam      (const char *name, struct passwd *pwbuf, char *buf, size_t buflen);
+ret_t cherokee_getgrnam      (const char *name, struct group *pwbuf, char *buf, size_t buflen);
-
-/* Misc

cherokee/trunk/configure.in

@@ -212 +212 @@
-AC_CHECK_FUNCS(gmtime gmtime_r localtime localtime_r getrlimit getdtablesize readdir readdir_r flockfile funlockfile)
-
+FW_CHECK_PWD
+FW_CHECK_GRP
-
-AH_BOTTOM([
@@ -920 +922 @@
-           [use_static_module="$use_static_module $enableval "],[])
-
-
+ round_robin
-
-# Remove modules that will not be compiles
@@ -985 +987 @@
-AM_CONDITIONAL(STATIC_VALIDATOR_PLAIN,        grep plain          $conf_h >/dev/null)
-AM_CONDITIONAL(STATIC_VALIDATOR_HTDIGEST,     grep htdigest       $conf_h >/dev/null)
+AM_CONDITIONAL(STATIC_BALANCER_ROUND_ROBIN,   grep round_robin    $conf_h >/dev/null)
-
-AC_OUTPUT(Makefile cherokee/Makefile.MingW m4/Makefile cherokee/Makefile cget/Makefile icons/Makefile themes/Makefile www/Makefile doc/Makefile doc/develop/Makefile doc/develop/doxygen.cfg contrib/Makefile qa/Makefile windows/Makefile  cherokee-config cherokee.spec cherokee.pc windows/cherokee.nsi)

cherokee/trunk/m4/Makefile.am

@@ -3 +3 @@
-network.m4 \
-sendfile_samba.m4 \
-
+
+