Added more server stuff, added examples of server

Author: mkoppanen

Diff for: config.m4

@@ -346,6 +346,7 @@ if test "$PHP_MEMCACHED" != "no"; then
     fi
 
     PHP_ADD_LIBRARY_WITH_PATH(memcachedprotocol, $PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR, MEMCACHED_SHARED_LIBADD)
+    PHP_ADD_LIBRARY_WITH_PATH(event, $PHP_LIBMEMCACHED_DIR/$PHP_LIBDIR, MEMCACHED_SHARED_LIBADD)
 
     PHP_NEW_EXTENSION(memcached, $PHP_MEMCACHED_FILES, $ext_shared,,$SESSION_INCLUDES $IGBINARY_INCLUDES)
     PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1)

Diff for: php_memcached.c

@@ -3418,10 +3418,16 @@ static int php_memc_do_result_callback(zval *zmemc_obj, zend_fcall_info *fci,
 static
 PHP_METHOD(MemcachedServer, run)
 {
+	char *address;
+	int address_len;
+
 	php_memc_server_t *intern;
 	intern = (php_memc_server_t *) zend_object_store_get_object(getThis() TSRMLS_CC);
 
-	php_memc_proto_handler_run (intern->handler);
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &address, &address_len) == FAILURE) {
+		return;
+	}
+	php_memc_proto_handler_run (intern->handler, address);
 }
 
 
@@ -3446,8 +3452,8 @@ PHP_METHOD(MemcachedServer, on)
 	}
 
 	if (fci.size > 0) {
-		MEMC_G(server_callbacks) [event].fci       = fci;
-		MEMC_G(server_callbacks) [event].fci_cache = fci_cache;
+		MEMC_G(server.callbacks) [event].fci       = fci;
+		MEMC_G(server.callbacks) [event].fci_cache = fci_cache;
 
 		Z_ADDREF_P (fci.function_name);
 		if (fci.object_ptr) {
@@ -4042,6 +4048,7 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
 	/*
 	 * Server callbacks
 	 */
+	REGISTER_MEMC_CLASS_CONST_LONG(ON_CONNECT,   MEMC_SERVER_ON_CONNECT);
 	REGISTER_MEMC_CLASS_CONST_LONG(ON_ADD,       MEMC_SERVER_ON_ADD);
 	REGISTER_MEMC_CLASS_CONST_LONG(ON_APPEND,    MEMC_SERVER_ON_APPEND);
 	REGISTER_MEMC_CLASS_CONST_LONG(ON_DECREMENT, MEMC_SERVER_ON_DECREMENT);

Diff for: php_memcached.h

@@ -60,20 +60,21 @@ enum memcached_serializer {
 
 typedef enum {
 	MEMC_SERVER_ON_MIN       = -1,
-	MEMC_SERVER_ON_ADD       = 0,
-	MEMC_SERVER_ON_APPEND    = 1,
-	MEMC_SERVER_ON_DECREMENT = 2,
-	MEMC_SERVER_ON_DELETE    = 3,
-	MEMC_SERVER_ON_FLUSH     = 4,
-	MEMC_SERVER_ON_GET       = 5,
-	MEMC_SERVER_ON_INCREMENT = 6,
-	MEMC_SERVER_ON_NOOP      = 7,
-	MEMC_SERVER_ON_PREPEND   = 8,
-	MEMC_SERVER_ON_QUIT      = 9,
-	MEMC_SERVER_ON_REPLACE   = 10,
-	MEMC_SERVER_ON_SET       = 11,
-	MEMC_SERVER_ON_STAT      = 12,
-	MEMC_SERVER_ON_VERSION   = 13,
+	MEMC_SERVER_ON_CONNECT   = 0,
+	MEMC_SERVER_ON_ADD       = 1,
+	MEMC_SERVER_ON_APPEND    = 2,
+	MEMC_SERVER_ON_DECREMENT = 3,
+	MEMC_SERVER_ON_DELETE    = 4,
+	MEMC_SERVER_ON_FLUSH     = 5,
+	MEMC_SERVER_ON_GET       = 6,
+	MEMC_SERVER_ON_INCREMENT = 7,
+	MEMC_SERVER_ON_NOOP      = 8,
+	MEMC_SERVER_ON_PREPEND   = 9,
+	MEMC_SERVER_ON_QUIT      = 10,
+	MEMC_SERVER_ON_REPLACE   = 11,
+	MEMC_SERVER_ON_SET       = 12,
+	MEMC_SERVER_ON_STAT      = 13,
+	MEMC_SERVER_ON_VERSION   = 14,
 	MEMC_SERVER_ON_MAX
 } php_memc_event_t;
 
@@ -119,7 +120,9 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 	bool use_sasl;
 #endif
 
-	php_memc_server_cb_t server_callbacks [14];
+	struct {
+		php_memc_server_cb_t callbacks [14];
+	} server;
 ZEND_END_MODULE_GLOBALS(php_memcached)
 
 PHP_MEMCACHED_API zend_class_entry *php_memc_get_ce(void);