tony2001

diff --git a/gpb2json.c b/gpb2json.c
index 2e0f77e..84ead67 100644
--- a/gpb2json.c
+++ b/gpb2json.c
@@ -11,6 +11,13 @@
 #define gen0(n) if (yajl_gen_status_ok != yajl_gen_##n(g)) { return -1; }
 #define gen(n, args...) if (yajl_gen_status_ok != yajl_gen_##n(g, args)) { return -1; }
 
+struct gpb2json_s {
+	yajl_gen g;

tony2001

diff --git a/gpb2json.c b/gpb2json.c
index 2e0f77e..06e4f49 100644
--- a/gpb2json.c
+++ b/gpb2json.c
@@ -11,6 +11,12 @@
 #define gen0(n) if (yajl_gen_status_ok != yajl_gen_##n(g)) { return -1; }
 #define gen(n, args...) if (yajl_gen_status_ok != yajl_gen_##n(g, args)) { return -1; }
 
+struct gpb2json_s {
+	yajl_gen g;

tony2001

diff --git a/json2gpb.c b/json2gpb.c
index 2ccc972..9fcabca 100644
--- a/json2gpb.c
+++ b/json2gpb.c
@@ -79,6 +79,9 @@ typedef struct {
 	ProtobufCAllocator *a;
 	char *err;
 	size_t err_sz;
+	unsigned int flags;
+	char skip_mode;

tony2001

diff --git a/json2gpb.c b/json2gpb.c
index 2ccc972..75343b5 100644
--- a/json2gpb.c
+++ b/json2gpb.c
@@ -79,6 +79,9 @@ typedef struct {
 	ProtobufCAllocator *a;
 	char *err;
 	size_t err_sz;
+	unsigned int flags;
+	char skip_mode;

tony2001

diff --git a/src/main.cc b/src/main.cc
index 0f4bfc7..9810022 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -87,6 +87,10 @@ int pinba_collector_init(pinba_daemon_settings settings) /* {{{ */
 
 	D->base = event_base_new();
 
+	if (pinba_pipe_open() < 0) {
+		return P_FAILURE;

tony2001

diff --git a/src/main.cc b/src/main.cc
index 0f4bfc7..e7a13f0 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -16,6 +16,7 @@
 
 #include "pinba.h"
 
+#include <signal.h>
 #include <sys/types.h>

tony2001

diff --git a/xdebug.c b/xdebug.c
index af6601e..c282744 100644
--- a/xdebug.c
+++ b/xdebug.c
@@ -1041,14 +1041,17 @@ ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xdebug)
 
 	if (XG(context.list.last_file)) {
 		xdfree(XG(context).list.last_file);
+		XG(context).list.last_file = NULL;
 	}

tony2001

==10202== Memcheck, a memory error detector
==10202== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al.
==10202== Using Valgrind-3.9.0 and LibVEX; rerun with -h for copyright info
==10202== Command: /local/php5/bin/php-cgi -c /local/php5/conf/php.ini --fpm-config /home/emakhrov/php-fpm.conf -F
==10202== Parent PID: 10201
==10202== 
==10202== Warning: set address range perms: large range [0x39fee000, 0x787ee000) (defined)
==10227== Invalid read of size 1
==10227==    at 0x4C2C3F1: strcmp (mc_replace_strmem.c:730)
==10227==    by 0x6C8C56A: xdebug_branch_info_mark_reached (xdebug_branch_info.c:347)

tony2001

diff --git a/xdebug.c b/xdebug.c
index af6601e..da88f34 100644
--- a/xdebug.c
+++ b/xdebug.c
@@ -1041,14 +1041,17 @@ ZEND_MODULE_POST_ZEND_DEACTIVATE_D(xdebug)
 
 	if (XG(context.list.last_file)) {
 		xdfree(XG(context).list.last_file);
+		XG(context).list.last_file = NULL;
 	}

tony2001

diff --git a/ngx_http_pinba_module.c b/ngx_http_pinba_module.c
index 7b27835..4e1c3fa 100644
--- a/ngx_http_pinba_module.c
+++ b/ngx_http_pinba_module.c
@@ -37,21 +37,25 @@ typedef struct {
 } ngx_pinba_word_t;
 
 typedef struct {
+	int fd;
+	struct sockaddr_storage sockaddr;