proc all signal that may generate a core

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@75 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Makefile.frag

@@ -31,5 +31,8 @@ processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
 $(builddir)/disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
 disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
 
-$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/myshm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c
-xcache.lo: $(XCACHE_PROC_H) $(srcdir)/myshm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c
+$(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/myshm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h
+xcache.lo: $(XCACHE_PROC_H) $(srcdir)/myshm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h
+
+xcachesvnclean: clean
+	cat $(srcdir)/.cvsignore | grep -v Makefile | xargs rm -f

foreachcoresig.h

@@ -0,0 +1,50 @@
+/* all signals generate coredump by default is list here */
+
+#ifdef SIGABRT
+FOREACH_SIG(SIGABRT);
+#endif
+
+#ifdef SIGBUS
+FOREACH_SIG(SIGBUS);
+#endif
+
+#ifdef SIGEMT
+FOREACH_SIG(SIGEMT);
+#endif
+
+#ifdef SIGFPE
+FOREACH_SIG(SIGFPE);
+#endif
+
+#ifdef SIGILL
+FOREACH_SIG(SIGILL);
+#endif
+
+#ifdef SIGIOT
+FOREACH_SIG(SIGIOT);
+#endif
+
+#ifdef SIGQUIT
+FOREACH_SIG(SIGQUIT);
+#endif
+
+#ifdef SIGSEGV
+FOREACH_SIG(SIGSEGV);
+#endif
+
+#ifdef SIGSYS
+FOREACH_SIG(SIGSYS);
+#endif
+
+#ifdef SIGTRAP
+FOREACH_SIG(SIGTRAP);
+#endif
+
+#ifdef SIGXCPU
+FOREACH_SIG(SIGXCPU);
+#endif
+
+#ifdef SIGXFSZ
+FOREACH_SIG(SIGXFSZ);
+#endif
+

xcache.c

@@ -508,6 +508,7 @@ static int xc_entry_init_key_php(xc_entry_t *xce, char *filename TSRMLS_DC) /* {
 	xc_hash_value_t hv;
 	int cacheid;
 	xc_entry_data_php_t *php;
+	char *ptr;
 
 	if (!filename || !SG(request_info).path_translated) {
 		return 0;
@@ -522,16 +523,35 @@ static int xc_entry_init_key_php(xc_entry_t *xce, char *filename TSRMLS_DC) /* {
 			}
 		}
 
+		/* absolute path */
 		pbuf = &buf;
 		if (IS_ABSOLUTE_PATH(filename, strlen(filename))) {
 			if (VCWD_STAT(filename, pbuf) != 0) {
 				return 0;
 			}
+			break;
 		}
-		else {
-			if (xc_stat(filename, PG(include_path), pbuf TSRMLS_CC) != 0) {   
+
+		/* relative path */
+		if (*filename == '.' && (IS_SLASH(filename[1]) || filename[1] == '.')) {
+			ptr = filename + 1;
+			if (*ptr == '.') {
+				while (*(++ptr) == '.');
+				if (!IS_SLASH(*ptr)) {
+					goto not_relative_path;
+				}   
+			}
+
+			if (VCWD_STAT(filename, pbuf) != 0) {
 				return 0;
 			}
+			break;
+		}
+not_relative_path:
+
+		/* use include_path */
+		if (xc_stat(filename, PG(include_path), pbuf TSRMLS_CC) != 0) {   
+			return 0;
 		}
 	} while (0);
 
@@ -608,6 +628,10 @@ static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /
 		return origin_compile_file(h, type TSRMLS_CC);
 	}
 
+	if (php_check_open_basedir(filename TSRMLS_CC) != 0) {
+		return NULL;
+	}
+
 	stored_xce = NULL;
 	op_array = NULL;
 	ENTER_LOCK(cache) {
@@ -1719,16 +1743,38 @@ static function_entry xcache_functions[] = /* {{{ */
 };
 /* }}} */
 
-/* signal handler */
-static void (*original_sigsegv_handler)(int) = NULL;
-static void xcache_sigsegv_handler(int sig) /* {{{ */
+/* old signal handlers {{{ */
+typedef void (*xc_sighandler_t)(int);
+#define FOREACH_SIG(sig) static xc_sighandler_t old_##sig##_handler = NULL
+#include "foreachcoresig.h"
+#undef FOREACH_SIG
+/* }}} */
+static void xcache_signal_handler(int sig);
+static void xcache_restore_signal_handler() /* {{{ */
 {
-	if (original_sigsegv_handler != xcache_sigsegv_handler) {
-		signal(SIGSEGV, original_sigsegv_handler);
-	}
-	else {
-		signal(SIGSEGV, SIG_DFL);
-	}
+#define FOREACH_SIG(sig) do { \
+	if (old_##sig##_handler != xcache_signal_handler) { \
+		signal(sig, old_##sig##_handler); \
+	} \
+	else { \
+		signal(sig, SIG_DFL); \
+	} \
+} while (0)
+#include "foreachcoresig.h"
+#undef FOREACH_SIG
+}
+/* }}} */
+static void xcache_init_signal_handler() /* {{{ */
+{
+#define FOREACH_SIG(sig) \
+	old_##sig##_handler = signal(sig, xcache_signal_handler)
+#include "foreachcoresig.h"
+#undef FOREACH_SIG
+}
+/* }}} */
+static void xcache_signal_handler(int sig) /* {{{ */
+{
+	xcache_restore_signal_handler();
 	if (xc_coredump_dir && xc_coredump_dir[0]) {
 		chdir(xc_coredump_dir);
 	}
@@ -1900,7 +1946,7 @@ static PHP_MINIT_FUNCTION(xcache)
 	}
 
 	if (xc_coredump_dir && xc_coredump_dir[0]) {
-		original_sigsegv_handler = signal(SIGSEGV, xcache_sigsegv_handler);
+		xcache_init_signal_handler();
 	}
 
 	xc_init_constant(module_number TSRMLS_CC);
@@ -1940,7 +1986,7 @@ static PHP_MSHUTDOWN_FUNCTION(xcache)
 #endif
 
 	if (xc_coredump_dir && xc_coredump_dir[0]) {
-		signal(SIGSEGV, original_sigsegv_handler);
+		xcache_restore_signal_handler();
 	}
 	if (xc_coredump_dir) {
 		pefree(xc_coredump_dir, 1);