tony2001

diff --git a/include/libangel_buf.h b/include/libangel_buf.h
index c2c176c..b244023 100644
--- a/include/libangel_buf.h
+++ b/include/libangel_buf.h
@@ -62,7 +62,7 @@ void libangel_buf_assemble_in_one(struct libangel_buf_chain_s *bc, struct libang
 void libangel_buf_remove(struct libangel_buf_chain_s *bc, struct libangel_buf_s *b);
 void libangel_buf_discard_all(struct libangel_buf_chain_s *bc);
 void libangel_buf_free_all(struct libangel_buf_s **head);
-int libangel_buf_enlarge(struct libangel_buf_chain_s *bc, struct libangel_buf_s *b, size_t more);
+struct libangel_buf_s *libangel_buf_enlarge(struct libangel_buf_chain_s *bc, struct libangel_buf_s *b, size_t more);

tony2001

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 8eaa0a3..6cf7b43 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2721,6 +2721,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC)
 	}
 	zend_accel_error(ACCEL_LOG_DEBUG, "Restart Scheduled!");
 
+	SHM_UNPROTECT();
 	ZCSG(restart_pending) = 1;

tony2001

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 8eaa0a3..7d1365b 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2713,6 +2713,17 @@ void accel_shutdown(TSRMLS_D)
 
 }
 
+void zend_accel_schedule_restart_lock(zend_accel_restart_reason reason TSRMLS_DC)
+{

tony2001

diff --git a/Makefile.so.am b/Makefile.so.am
index 2e746a0..1ca3602 100644
--- a/Makefile.so.am
+++ b/Makefile.so.am
@@ -4,8 +4,9 @@ all: $(SO_FILES)
 
 %.so: $(PROTO_DIR)/%.proto
 	$(PROTOBUF_C_COMPILER) -I$(PROTO_DIR) --c_out=. $< --descriptor_set_out=$*.fds.bin
+	$(eval tmp_file_name := $(shell echo $* | tr - _))
 	xxd -i $*.fds.bin | \

tony2001

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index b6b6ec1..86bac59 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1997,7 +1997,8 @@ static char* persistent_zend_resolve_path(const char *filename, int filename_len
 			zend_persistent_script *persistent_script;
 
 		    /* Check if requested file already cached (by full name) */
-		    if ((IS_ABSOLUTE_PATH(filename, filename_len) ||
+		    if (!ZCG(accel_directives).revalidate_path &&

tony2001

<?php
class A
{
    private $a;

    public function __construct() { 
        $this->a = function () { return true; }; 
    }

    public function doAction() {

tony2001

diff --git a/php_pinba.h b/php_pinba.h
index 5dede62..5598786 100644
--- a/php_pinba.h
+++ b/php_pinba.h
@@ -52,7 +52,9 @@ ZEND_BEGIN_MODULE_GLOBALS(pinba) /* {{{ */
 	char *collector_address;
 	char *server_host;
 	char *server_port;
+#if PHP_VERSION_ID < 50400
 	int (*old_sapi_ub_write) (const char *, unsigned int TSRMLS_DC);

tony2001

diff --git a/gpbs_client_port.c b/gpbs_client_port.c
index d24c14b..77a90a2 100644
--- a/gpbs_client_port.c
+++ b/gpbs_client_port.c
@@ -23,30 +23,8 @@
 #endif
 
 
-typedef enum {
-	state_connecting = 0,

tony2001

diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
index 5db4794..9f971d6 100644
--- a/sapi/fpm/fpm/fpm_stdio.c
+++ b/sapi/fpm/fpm/fpm_stdio.c
@@ -182,6 +182,8 @@ static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg)
 
 int fpm_stdio_prepare_pipes(struct fpm_child_s *child) /* {{{ */
 {
+	int i;
+

tony2001

=== modified file 'libmariadb/CMakeLists.txt'
--- libmariadb/CMakeLists.txt	2014-01-11 19:09:32 +0000
+++ libmariadb/CMakeLists.txt	2014-02-04 10:39:35 +0000
@@ -127,7 +127,6 @@
     ../zlib/compress.c
     ../zlib/crc32.c
     ../zlib/deflate.c
-    ../zlib/example.c
     ../zlib/gzclose.c
     ../zlib/gzlib.c