tony2001

Index: memcache_pool.h
===================================================================
--- memcache_pool.h	(revision 328353)
+++ memcache_pool.h	(working copy)
@@ -228,8 +228,19 @@
 	uint16_t			reqid;					/* next sequential request id */
 	char				*error;					/* last error message */
 	int					errnum;					/* last error code */
+	int					state;					/* connection state */
 };

tony2001

Index: rar_stream.c
===================================================================
--- rar_stream.c	(revision 329976)
+++ rar_stream.c	(working copy)
@@ -754,7 +754,7 @@
 			if ((*archive = expand_filepath(tmp_archive, NULL TSRMLS_CC))
 					== NULL) {
 				php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
-					"Could not expand the path %s", archive);
+					"Could not expand the path %s", *archive);

tony2001

Index: rar_stream.c
===================================================================
--- rar_stream.c	(revision 329976)
+++ rar_stream.c	(working copy)
@@ -754,7 +754,7 @@
 			if ((*archive = expand_filepath(tmp_archive, NULL TSRMLS_CC))
 					== NULL) {
 				php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
-					"Could not expand the path %s", archive);
+					"Could not expand the path %s", *archive);

tony2001

diff --git a/src/jobs.c b/src/jobs.c
index 3c72d80..273d427 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -555,14 +555,24 @@ static inline void _trustd_job_add_friends(void *data) /* {{{ */
 	__sync_fetch_and_add(&F->user_stats.is_searchable_cnt, new_is_searchable);
 	__sync_fetch_and_add(&F->user_stats.mem_circle1, (new_mem_circle1 - old_mem_circle1) + friend_mem_circle1_diff);
 
-	if (u1_contacts_size > F->user_stats.max_contacts_cnt) {
-		__sync_val_compare_and_swap(&F->user_stats.max_contacts_cnt, F->user_stats.max_contacts_cnt, u1_contacts_size);

tony2001

diff --git a/src/ha_pinba.cc b/src/ha_pinba.cc
index 67175f4..271907f 100644
--- a/src/ha_pinba.cc
+++ b/src/ha_pinba.cc
@@ -787,7 +787,6 @@ static inline pinba_tag_report *pinba_regenerate_tag_info(PINBA_SHARE *share) /*
 
 		for (j = 0; j < record->timers_cnt; j++) {
 			tag_found = 0;
-			pthread_rwlock_rdlock(&D->timer_lock);
 			timer = record_get_timer(&D->timer_pool, record, j);

tony2001

diff --git a/src/data.cc b/src/data.cc
index c97e51e..96af3d8 100644
--- a/src/data.cc
+++ b/src/data.cc
@@ -1016,7 +1016,7 @@ void pinba_reports_destroy() /* {{{ */
 }
 /* }}} */
 
-void pinba_tag_reports_destroy(int force) /* {{{ */
+void pinba_tag_reports_destroy(void) /* {{{ */

tony2001

diff --git a/src/ha_pinba.cc b/src/ha_pinba.cc
index 311bc2e..bcf54c4 100644
--- a/src/ha_pinba.cc
+++ b/src/ha_pinba.cc
@@ -3566,14 +3566,14 @@ inline int ha_pinba::requests_fetch_row(unsigned char *buf, size_t index, size_t
 
 	if (index == p->in || index < 0 || index >= (unsigned int)p->size || p->in == p->out) {
 		pthread_rwlock_unlock(&D->collector_lock);
-		DBUG_RETURN(HA_ERR_KEY_NOT_FOUND);
+		DBUG_RETURN(HA_ERR_END_OF_FILE);

tony2001

diff --git a/xdebug.c b/xdebug.c
index 9f024a5..bafef39 100644
--- a/xdebug.c
+++ b/xdebug.c
@@ -912,7 +912,7 @@ PHP_RINIT_FUNCTION(xdebug)
 	 * Xdebug's error handler to keep soap fault from fucking up. */
 	if (XG(default_enable) && zend_hash_find(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), "HTTP_SOAPACTION", 16, (void**)&dummy) == FAILURE) {
 		/* If zend_error_cb has been changed by another ext, register it as external cb */
-		if (zend_error_cb != xdebug_old_error_cb) {
+		if (zend_error_cb != xdebug_new_error_cb) {

tony2001

diff --git a/acinclude.m4 b/acinclude.m4
index 7bb0354..82a5dcf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -984,3 +984,48 @@ AC_DEFUN([AX_GTEST],
                AC_SUBST([GTEST_LIBS])
                AC_SUBST([GTEST_SUBDIR])
 ])
+
+AC_DEFUN([AX_LIBSPINDLE],

tony2001

diff --git a/src/libangel_buf.c b/src/libangel_buf.c
index 2bf7a97..4bc3e01 100644
--- a/src/libangel_buf.c
+++ b/src/libangel_buf.c
@@ -175,7 +175,7 @@ void libangel_buf_discard_all(struct libangel_buf_chain_s *bc)
     }
 }
 
-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)