Changeset 150

Timestamp:

02/08/06 10:45:50 (3 years ago)

Author:

zoeloelip

Message:

The owner of the a sysvipc mutex will now be changed on creation of

of the mutex. The user will be set to the uid set with
--with-eaccelerator-userid. This way the semaphore doesn't need to
be public writable anymore.

Moved some inactive contributors to the inactive list.

Files:

• eaccelerator/trunk/AUTHORS (modified) (1 diff)
• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/config.m4 (modified) (3 diffs)
• eaccelerator/trunk/eaccelerator.c (modified) (2 diffs)
• eaccelerator/trunk/mm.c (modified) (1 diff)

eaccelerator/trunk/AUTHORS

@@ -1 +1 @@
-Actual Team :
-- Frank Alcantara  <frankalcantara at users.sourceforge.net>
-- Franck Tabary <franck34 at users.sourceforge.net>
-- Bart Vanbrabant <zoeloelip at users.sourceforge.net>
-- Shin Seung Woo <segv74 at users.sourceforge.net>
-
-Inactive member(s) :
-- Everaldo Canuto <everaldo_canuto at users.sourceforge.net>
-- Reiner Jung  <reinerj at users.sourceforge.net>  
+- Shin Seung Woo <segv74 at users.sourceforge.net>
+- Frank Alcantara  <frankalcantara at users.sourceforge.net>
-
-eAccelerator is based on Turck MMCache, written by

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-02-08 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * The owner of the a sysvipc mutex will now be changed on creation of
+          of the mutex. The user will be set to the uid set with 
+          --with-eaccelerator-userid. This way the semaphore doesn't need to
+          be public writable anymore.
+        * Moved some inactive contributors to the inactive list.
+
-2006-01-10 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/config.m4

@@ -93 +93 @@
-])
-
+AC_ARG_WITH(eaccelerator-userid,
+[  --with-eaccelerator-userid               eAccelerator runs under this userid, only needed when using sysvipc semaphores.],[
+  ea_userid=$withval
+],[
+  ea_userid=0
+])
+
-dnl PHP_BUILD_SHARED
-if test "$PHP_EACCELERATOR" != "no"; then
@@ -98 +105 @@
-  AC_DEFINE(HAVE_EACCELERATOR, 1, [Define if you like to use eAccelerator])
-
+  AC_DEFINE_UNQUOTED(EA_USERID, $ea_userid, [The userid eAccelerator will be running under.]) 
+    
-  if test "$eaccelerator_crash_detection" = "yes"; then
-    AC_DEFINE(WITH_EACCELERATOR_CRASH_DETECTION, 1, [Define if you like to release eAccelerator resources on PHP crash])
@@ -301 +310 @@
-    msg="spinlock"
-  elif test "$mm_sem_ipc" = "yes"; then
-
-
+
+
+
+
+
+
-  elif test "$mm_sem_fcntl" = "yes"; then
-    AC_DEFINE(MM_SEM_FCNTL, 1, [Define if you like to use fcntl based semaphores])

eaccelerator/trunk/eaccelerator.c

@@ -247 +247 @@
-  }
-  EACCELERATOR_UNLOCK_RW();
-}
-
-/* check the cache dir */
-static int check_cache_dir(char *cache_dir) {
-  struct stat buf;
-//  int uid = 0;
-//  int gid = 0;
-  
-  if (stat(cache_dir, &buf) == -1) {
-    ea_debug_error("Cache dir does not exist (could not stat %s)\n", cache_dir);
-    return FAILURE;
-  }
-  if (!(buf.st_mode & S_IFDIR)) {
-    ea_debug_error("%s is not a directory!\n", cache_dir);
-    return FAILURE;
-  }
-#if 0
-  uid = getuid();
-  gid = getgid();
-  if (!((buf.st_uid == uid && (buf.st_mode & (S_IRUSR | S_IWUSR))) /* not root, owner and rw */
-        || (buf.st_gid == gid && (buf.st_mode & (S_IRGRP | S_IWGRP))) /* not root, group and rw */
-        || (buf.st_mode & (S_IROTH & S_IWOTH)))) { /* other and rw */
-    ea_debug_error("%s hasn't got the right permissions!\n", cache_dir);
-    return 0;
-  }
-#endif
-  return SUCCESS;
-}
-
@@ -2023 +1996 @@
-      eaccelerator_mm_instance->enabled = 0;
-    }
-#if 0
-    if (!eaccelerator_scripts_shm_only && check_cache_dir(EAG(cache_dir)) == FAILURE) {
-      zend_error(E_CORE_WARNING,"[%s] Can not init the cache directory", EACCELERATOR_EXTENSION_NAME);
-      /* disable eA */
-      eaccelerator_mm_instance->enabled = 0;
-    }
-#endif
-    mm_saved_zend_compile_file = zend_compile_file;
-

eaccelerator/trunk/mm.c

@@ -322 +322 @@
-  int rc;
-  union semun arg;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  arg.val = 1;
-  do {