No OneTemporary
Actions

Authored By

Unknown

Size

689 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/amqp-1.6.1/amqp.c b/amqp-1.6.1/amqp.c
	deleted file mode 100644
	index 2c91fbf..0000000
	--- a/amqp-1.6.1/amqp.c
	+++ /dev/null
	@@ -1,1055 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_ini.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <stdint.h>
	-# include <signal.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-
	-#include "php_amqp.h"
	-#include "amqp_connection.h"
	-#include "amqp_channel.h"
	-#include "amqp_queue.h"
	-#include "amqp_exchange.h"
	-#include "amqp_envelope.h"
	-#include "amqp_connection_resource.h"
	-
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-/* True global resources - no need for thread safety here */
	-zend_class_entry *amqp_connection_class_entry;
	-zend_class_entry *amqp_channel_class_entry;
	-zend_class_entry *amqp_queue_class_entry;
	-zend_class_entry *amqp_exchange_class_entry;
	-zend_class_entry *amqp_envelope_class_entry;
	-
	-zend_class_entry *amqp_exception_class_entry,
	- *amqp_connection_exception_class_entry,
	- *amqp_channel_exception_class_entry,
	- *amqp_queue_exception_class_entry,
	- *amqp_exchange_exception_class_entry;
	-
	-
	-/* The last parameter of ZEND_BEGIN_ARG_INFO_EX indicates how many of the method flags are required. */
	-/* The first parameter of ZEND_ARG_INFO indicates whether the variable is being passed by reference */
	-
	-/* amqp_connection_class ARG_INFO definition */
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_ARRAY_INFO(0, credentials, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_isConnected, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_connect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_pconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_pdisconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_disconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_reconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_preconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getLogin, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setLogin, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, login)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getPassword, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setPassword, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, password)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getHost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setHost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, host)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getPort, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setPort, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, port)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getVhost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setVhost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, vhost)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, timeout)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getReadTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setReadTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, timeout)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getWriteTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setWriteTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, timeout)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getUsedChannels, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getMaxChannels, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getMaxFrameSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getHeartbeatInterval, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_isPersistent, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-
	-/* amqp_channel_class ARG_INFO definition */
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, amqp_connection)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_isConnected, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getChannelId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setPrefetchSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, size)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getPrefetchSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setPrefetchCount, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, count)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getPrefetchCount, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_qos, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	- ZEND_ARG_INFO(0, size)
	- ZEND_ARG_INFO(0, count)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_startTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_commitTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_rollbackTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_basicRecover, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_INFO(0, requeue)
	-ZEND_END_ARG_INFO()
	-
	-/* amqp_queue_class ARG_INFO definition */
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, amqp_channel)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, queue_name)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, argument)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	- ZEND_ARG_INFO(0, key)
	- ZEND_ARG_INFO(0, value)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_ARRAY_INFO(0, arguments, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_declareQueue, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_bind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, exchange_name)
	- ZEND_ARG_INFO(0, routing_key)
	- ZEND_ARG_INFO(0, arguments)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_get, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_consume, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, callback)
	- ZEND_ARG_INFO(0, flags)
	- ZEND_ARG_INFO(0, consumer_tag)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_ack, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, delivery_tag)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_nack, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, delivery_tag)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_reject, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, delivery_tag)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_purge, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_cancel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_INFO(0, consumer_tag)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_unbind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, exchange_name)
	- ZEND_ARG_INFO(0, routing_key)
	- ZEND_ARG_INFO(0, arguments)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_delete, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getChannel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getConsumerTag, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-/* amqp_exchange ARG_INFO definition */
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, amqp_channel)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, exchange_name)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, exchange_type)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, argument)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	- ZEND_ARG_INFO(0, key)
	- ZEND_ARG_INFO(0, value)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_ARRAY_INFO(0, arguments, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_declareExchange, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_bind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	- ZEND_ARG_INFO(0, exchange_name)
	- ZEND_ARG_INFO(0, routing_key)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_unbind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	- ZEND_ARG_INFO(0, exchange_name)
	- ZEND_ARG_INFO(0, routing_key)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_delete, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	- ZEND_ARG_INFO(0, exchange_name)
	- ZEND_ARG_INFO(0, flags)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_publish, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	- ZEND_ARG_INFO(0, message)
	- ZEND_ARG_INFO(0, routing_key)
	- ZEND_ARG_INFO(0, flags)
	- ZEND_ARG_ARRAY_INFO(0, headers, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getChannel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-/* amqp_envelope_class ARG_INFO definition */
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getBody, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getRoutingKey, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryTag, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryMode, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExchangeName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_isRedelivery, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentEncoding, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getPriority, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExpiration, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getUserId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getAppId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getMessageId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getReplyTo, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getCorrelationId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeaders, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeader, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	-ZEND_END_ARG_INFO()
	-
	-
	-/* {{{ amqp_functions[]
	-*
	-*Every user visible function must have an entry in amqp_functions[].
	-*/
	-zend_function_entry amqp_connection_class_functions[] = {
	- PHP_ME(amqp_connection_class, __construct, arginfo_amqp_connection_class__construct, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, isConnected, arginfo_amqp_connection_class_isConnected, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, connect, arginfo_amqp_connection_class_connect, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, pconnect, arginfo_amqp_connection_class_pconnect, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, pdisconnect, arginfo_amqp_connection_class_pdisconnect, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, disconnect, arginfo_amqp_connection_class_disconnect, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, reconnect, arginfo_amqp_connection_class_reconnect, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, preconnect, arginfo_amqp_connection_class_preconnect, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getLogin, arginfo_amqp_connection_class_getLogin, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setLogin, arginfo_amqp_connection_class_setLogin, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getPassword, arginfo_amqp_connection_class_getPassword, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setPassword, arginfo_amqp_connection_class_setPassword, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getHost, arginfo_amqp_connection_class_getHost, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setHost, arginfo_amqp_connection_class_setHost, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getPort, arginfo_amqp_connection_class_getPort, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setPort, arginfo_amqp_connection_class_setPort, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getVhost, arginfo_amqp_connection_class_getVhost, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setVhost, arginfo_amqp_connection_class_setVhost, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getTimeout, arginfo_amqp_connection_class_getTimeout, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setTimeout, arginfo_amqp_connection_class_setTimeout, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getReadTimeout, arginfo_amqp_connection_class_getReadTimeout, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setReadTimeout, arginfo_amqp_connection_class_setReadTimeout, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getWriteTimeout, arginfo_amqp_connection_class_getWriteTimeout, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, setWriteTimeout, arginfo_amqp_connection_class_setWriteTimeout, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_connection_class, getUsedChannels, arginfo_amqp_connection_class_getUsedChannels, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, getMaxChannels, arginfo_amqp_connection_class_getMaxChannels, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, isPersistent, arginfo_amqp_connection_class_isPersistent, ZEND_ACC_PUBLIC)
	-#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	- PHP_ME(amqp_connection_class, getHeartbeatInterval, arginfo_amqp_connection_class_getHeartbeatInterval, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_connection_class, getMaxFrameSize, arginfo_amqp_connection_class_getMaxFrameSize, ZEND_ACC_PUBLIC)
	-#endif
	-
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-
	-zend_function_entry amqp_channel_class_functions[] = {
	- PHP_ME(amqp_channel_class, __construct, arginfo_amqp_channel_class__construct, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, isConnected, arginfo_amqp_channel_class_isConnected, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_channel_class, getChannelId, arginfo_amqp_channel_class_getChannelId, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_channel_class, setPrefetchSize, arginfo_amqp_channel_class_setPrefetchSize, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, getPrefetchSize, arginfo_amqp_channel_class_getPrefetchSize, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, setPrefetchCount,arginfo_amqp_channel_class_setPrefetchCount,ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, getPrefetchCount,arginfo_amqp_channel_class_getPrefetchCount,ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, qos, arginfo_amqp_channel_class_qos, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_channel_class, startTransaction, arginfo_amqp_channel_class_startTransaction, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, commitTransaction, arginfo_amqp_channel_class_commitTransaction, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_channel_class, rollbackTransaction, arginfo_amqp_channel_class_rollbackTransaction, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_channel_class, getConnection, arginfo_amqp_channel_class_getConnection, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_channel_class, basicRecover, arginfo_amqp_channel_class_basicRecover, ZEND_ACC_PUBLIC)
	-
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-
	-zend_function_entry amqp_queue_class_functions[] = {
	- PHP_ME(amqp_queue_class, __construct, arginfo_amqp_queue_class__construct, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, getName, arginfo_amqp_queue_class_getName, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, setName, arginfo_amqp_queue_class_setName, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, getFlags, arginfo_amqp_queue_class_getFlags, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, setFlags, arginfo_amqp_queue_class_setFlags, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, getArgument, arginfo_amqp_queue_class_getArgument, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, getArguments, arginfo_amqp_queue_class_getArguments, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, setArgument, arginfo_amqp_queue_class_setArgument, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, setArguments, arginfo_amqp_queue_class_setArguments, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, declareQueue, arginfo_amqp_queue_class_declareQueue, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, bind, arginfo_amqp_queue_class_bind, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, get, arginfo_amqp_queue_class_get, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, consume, arginfo_amqp_queue_class_consume, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, ack, arginfo_amqp_queue_class_ack, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, nack, arginfo_amqp_queue_class_nack, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, reject, arginfo_amqp_queue_class_reject, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, purge, arginfo_amqp_queue_class_purge, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, cancel, arginfo_amqp_queue_class_cancel, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, delete, arginfo_amqp_queue_class_delete, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, unbind, arginfo_amqp_queue_class_unbind, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_queue_class, getChannel, arginfo_amqp_queue_class_getChannel, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, getConnection, arginfo_amqp_queue_class_getConnection, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_queue_class, getConsumerTag, arginfo_amqp_queue_class_getConsumerTag, ZEND_ACC_PUBLIC)
	-
	- PHP_MALIAS(amqp_queue_class, declare, declareQueue, arginfo_amqp_queue_class_declareQueue, ZEND_ACC_PUBLIC \| ZEND_ACC_DEPRECATED)
	-
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-
	-zend_function_entry amqp_exchange_class_functions[] = {
	- PHP_ME(amqp_exchange_class, __construct, arginfo_amqp_exchange_class__construct, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, getName, arginfo_amqp_exchange_class_getName, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, setName, arginfo_amqp_exchange_class_setName, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, getFlags, arginfo_amqp_exchange_class_getFlags, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, setFlags, arginfo_amqp_exchange_class_setFlags, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, getType, arginfo_amqp_exchange_class_getType, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, setType, arginfo_amqp_exchange_class_setType, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, getArgument, arginfo_amqp_exchange_class_getArgument, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, getArguments, arginfo_amqp_exchange_class_getArguments, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, setArgument, arginfo_amqp_exchange_class_setArgument, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, setArguments, arginfo_amqp_exchange_class_setArguments, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, declareExchange,arginfo_amqp_exchange_class_declareExchange,ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, bind, arginfo_amqp_exchange_class_bind, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, unbind, arginfo_amqp_exchange_class_unbind, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, delete, arginfo_amqp_exchange_class_delete, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, publish, arginfo_amqp_exchange_class_publish, ZEND_ACC_PUBLIC)
	-
	- PHP_ME(amqp_exchange_class, getChannel, arginfo_amqp_exchange_class_getChannel, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_exchange_class, getConnection, arginfo_amqp_exchange_class_getConnection, ZEND_ACC_PUBLIC)
	-
	- PHP_MALIAS(amqp_exchange_class, declare, declareExchange, arginfo_amqp_exchange_class_declareExchange, ZEND_ACC_PUBLIC \| ZEND_ACC_DEPRECATED)
	-
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-
	-zend_function_entry amqp_envelope_class_functions[] = {
	- PHP_ME(amqp_envelope_class, __construct, arginfo_amqp_envelope_class__construct, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getBody, arginfo_amqp_envelope_class_getBody, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getRoutingKey, arginfo_amqp_envelope_class_getRoutingKey, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getDeliveryTag, arginfo_amqp_envelope_class_getDeliveryTag, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getDeliveryMode, arginfo_amqp_envelope_class_getDeliveryMode, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getExchangeName, arginfo_amqp_envelope_class_getExchangeName, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, isRedelivery, arginfo_amqp_envelope_class_isRedelivery, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getContentType, arginfo_amqp_envelope_class_getContentType, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getContentEncoding, arginfo_amqp_envelope_class_getContentEncoding, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getType, arginfo_amqp_envelope_class_getType, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getTimestamp, arginfo_amqp_envelope_class_getTimestamp, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getPriority, arginfo_amqp_envelope_class_getPriority, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getExpiration, arginfo_amqp_envelope_class_getExpiration, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getUserId, arginfo_amqp_envelope_class_getUserId, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getAppId, arginfo_amqp_envelope_class_getAppId, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getMessageId, arginfo_amqp_envelope_class_getMessageId, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getReplyTo, arginfo_amqp_envelope_class_getReplyTo, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getCorrelationId, arginfo_amqp_envelope_class_getCorrelationId, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getHeaders, arginfo_amqp_envelope_class_getHeaders, ZEND_ACC_PUBLIC)
	- PHP_ME(amqp_envelope_class, getHeader, arginfo_amqp_envelope_class_getHeader, ZEND_ACC_PUBLIC)
	-
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-
	-zend_function_entry amqp_functions[] = {
	- {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	-};
	-/* }}} */
	-
	-/* {{{ amqp_module_entry
	-*/
	-zend_module_entry amqp_module_entry = {
	-#if ZEND_MODULE_API_NO >= 20010901
	- STANDARD_MODULE_HEADER,
	-#endif
	- "amqp",
	- amqp_functions,
	- PHP_MINIT(amqp),
	- PHP_MSHUTDOWN(amqp),
	- NULL,
	- NULL,
	- PHP_MINFO(amqp),
	-#if ZEND_MODULE_API_NO >= 20010901
	- PHP_AMQP_VERSION,
	-#endif
	- STANDARD_MODULE_PROPERTIES
	-};
	-/* }}} */
	-
	-#ifdef COMPILE_DL_AMQP
	- ZEND_GET_MODULE(amqp)
	-#endif
	-
	-void php_amqp_error(amqp_rpc_reply_t reply, char *message, amqp_connection_object connection, amqp_channel_object *channel TSRMLS_DC)
	-{
	- assert(connection != NULL);
	- assert(connection->connection_resource != NULL);
	-
	- switch (php_amqp_connection_resource_error(reply, message, connection->connection_resource, (channel ? channel->channel_id : 0) TSRMLS_CC)) {
	- case PHP_AMQP_RESOURCE_RESPONSE_OK:
	- break;
	- case PHP_AMQP_RESOURCE_RESPONSE_ERROR:
	- /* Library or other non-protocol or even protocol related errors may be here, do nothing with this for now. */
	- break;
	- case PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED:
	- /* Mark channel as closed to prevent sending channel.close request */
	- assert(channel != NULL);
	- channel->is_connected = '\0';
	-
	- /* Close channel */
	- php_amqp_close_channel(channel TSRMLS_CC);
	-
	- /* No more error handling necessary, returning. */
	- break;
	- case PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED:
	- /* Mark connection as closed to prevent sending any further requests */
	- connection->is_connected = '\0';
	-
	- /* Close connection with all its channels */
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	-
	- /* No more error handling necessary, returning. */
	- break;
	- default:
	- spprintf(message, 0, "Unknown server error, method id 0x%08X (not handled by extension)", reply.reply.id);
	- break;
	- }
	-}
	-
	-void php_amqp_zend_throw_exception(amqp_rpc_reply_t reply, zend_class_entry exception_ce, const char message, long code TSRMLS_DC)
	-{
	- switch (reply.reply_type) {
	- case AMQP_RESPONSE_NORMAL:
	- break;
	- case AMQP_RESPONSE_NONE:
	- exception_ce = amqp_exception_class_entry;
	- break;
	- case AMQP_RESPONSE_LIBRARY_EXCEPTION:
	- exception_ce = amqp_exception_class_entry;
	- break;
	- case AMQP_RESPONSE_SERVER_EXCEPTION:
	- switch (reply.reply.id) {
	- case AMQP_CONNECTION_CLOSE_METHOD:
	- /* Fatal errors - pass them to connection level */
	- exception_ce = amqp_connection_exception_class_entry;
	- break;
	- case AMQP_CHANNEL_CLOSE_METHOD:
	- /* Most channel-level errors occurs due to previously known action and thus their kind can be predicted. */
	- /* exception_ce = amqp_channel_exception_class_entry; */
	- break;
	- }
	- break;
	- /* Default for the above switch should be handled by the below default. */
	- default:
	- exception_ce = amqp_exception_class_entry;
	- break;
	- }
	-
	- zend_throw_exception(exception_ce, message, code TSRMLS_CC);
	-}
	-
	-
	-void php_amqp_maybe_release_buffers_on_channel(amqp_connection_object connection, amqp_channel_object channel)
	-{
	- assert(connection != NULL);
	- assert(channel != NULL);
	- assert(channel->channel_id > 0);
	-
	- if (connection->connection_resource) {
	- amqp_maybe_release_buffers_on_channel(connection->connection_resource->connection_state, channel->channel_id);
	- }
	-}
	-
	-amqp_bytes_t php_amqp_long_string(char const *cstr, int len)
	-{
	- if (len < 1) {
	- return amqp_empty_bytes;
	- }
	-
	- amqp_bytes_t result;
	- result.len = len;
	- result.bytes = (void *) cstr;
	- return result;
	-}
	-
	-char *stringify_bytes(amqp_bytes_t bytes)
	-{
	-/* We will need up to 4 chars per byte, plus the terminating 0 */
	- char res = emalloc(bytes.len 4 + 1);
	- uint8_t *data = bytes.bytes;
	- char *p = res;
	- size_t i;
	-
	- for (i = 0; i < bytes.len; i++) {
	- if (data[i] >= 32 && data[i] != 127) {
	- *p++ = data[i];
	- } else {
	- *p++ = '\\';
	- *p++ = '0' + (data[i] >> 6);
	- *p++ = '0' + (data[i] >> 3 & 0x7);
	- *p++ = '0' + (data[i] & 0x7);
	- }
	- }
	-
	- *p = 0;
	- return res;
	-}
	-
	-void internal_convert_zval_to_amqp_table(zval zvalArguments, amqp_table_t arguments, char allow_int_keys TSRMLS_DC)
	-{
	- HashTable *argumentHash;
	- HashPosition pos;
	- zval **data;
	- char type[16];
	- amqp_table_t *inner_table;
	-
	- argumentHash = Z_ARRVAL_P(zvalArguments);
	-
	- /* Allocate all the memory necessary for storing the arguments */
	- arguments->entries = (amqp_table_entry_t *)ecalloc(zend_hash_num_elements(argumentHash), sizeof(amqp_table_entry_t));
	- arguments->num_entries = 0;
	-
	- for (zend_hash_internal_pointer_reset_ex(argumentHash, &pos);
	- zend_hash_get_current_data_ex(argumentHash, (void**) &data, &pos) == SUCCESS;
	- zend_hash_move_forward_ex(argumentHash, &pos)) {
	-
	- zval value;
	- char *key;
	- uint key_len;
	- ulong index;
	- char *strKey;
	- char *strValue;
	- amqp_table_entry_t *table;
	- amqp_field_value_t *field;
	-
	-
	- /* Make a copy of the value: */
	- value = **data;
	- zval_copy_ctor(&value);
	-
	- /* Now pull the key */
	-
	- if (zend_hash_get_current_key_ex(argumentHash, &key, &key_len, &index, 0, &pos) != HASH_KEY_IS_STRING) {
	-
	- if (allow_int_keys) {
	- /* Convert to strings non-string keys */
	- char str[32];
	-
	- key_len = sprintf(str, "%lu", index);
	- key = str;
	- } else {
	- /* Skip things that are not strings */
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ignoring non-string header field '%lu'", index);
	-
	- continue;
	- }
	-
	- }
	-
	- /* Build the value */
	- table = &arguments->entries[arguments->num_entries++];
	- field = &table->value;
	-
	- switch (Z_TYPE_P(&value)) {
	- case IS_BOOL:
	- field->kind = AMQP_FIELD_KIND_BOOLEAN;
	- field->value.boolean = (amqp_boolean_t)Z_LVAL_P(&value);
	- break;
	- case IS_DOUBLE:
	- field->kind = AMQP_FIELD_KIND_F64;
	- field->value.f64 = Z_DVAL_P(&value);
	- break;
	- case IS_LONG:
	- field->kind = AMQP_FIELD_KIND_I64;
	- field->value.i64 = Z_LVAL_P(&value);
	- break;
	- case IS_STRING:
	- field->kind = AMQP_FIELD_KIND_UTF8;
	-
	- if (Z_STRLEN_P(&value)) {
	- amqp_bytes_t bytes;
	- bytes.len = (size_t) Z_STRLEN_P(&value);
	- bytes.bytes = estrndup(Z_STRVAL_P(&value), (uint)Z_STRLEN_P(&value));
	-
	- field->value.bytes = bytes;
	- } else {
	- field->value.bytes = amqp_empty_bytes;
	- }
	-
	- break;
	- case IS_ARRAY:
	- field->kind = AMQP_FIELD_KIND_TABLE;
	- internal_convert_zval_to_amqp_table(&value, &field->value.table, 1 TSRMLS_CC);
	-
	- break;
	- default:
	- switch(Z_TYPE_P(&value)) {
	- case IS_NULL: strcpy(type, "null"); break;
	- case IS_OBJECT: strcpy(type, "object"); break;
	- case IS_RESOURCE: strcpy(type, "resource"); break;
	- default: strcpy(type, "unknown");
	- }
	-
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ignoring field '%s' due to unsupported value type (%s)", key, type);
	-
	- /* Reset entries counter back */
	- arguments->num_entries --;
	- continue;
	- }
	-
	- strKey = estrndup(key, key_len);
	- table->key = amqp_cstring_bytes(strKey);
	-
	- /* Clean up the zval */
	- zval_dtor(&value);
	- }
	-}
	-
	-inline amqp_table_t convert_zval_to_amqp_table(zval zvalArguments TSRMLS_DC)
	-{
	- amqp_table_t *arguments;
	- /* In setArguments, we are overwriting all the existing values */
	- arguments = (amqp_table_t *)emalloc(sizeof(amqp_table_t));
	-
	- internal_convert_zval_to_amqp_table(zvalArguments, arguments, 0 TSRMLS_CC);
	-
	- return arguments;
	-}
	-
	-
	-
	-
	-void internal_php_amqp_free_amqp_table(amqp_table_t *object, char clear_root)
	-{
	- if (!object) {
	- return;
	- }
	-
	- if (object->entries) {
	- int macroEntryCounter;
	- for (macroEntryCounter = 0; macroEntryCounter < object->num_entries; macroEntryCounter++) {
	-
	- amqp_table_entry_t *entry = &object->entries[macroEntryCounter];
	- efree(entry->key.bytes);
	-
	- switch (entry->value.kind) {
	- case AMQP_FIELD_KIND_TABLE:
	- internal_php_amqp_free_amqp_table(&entry->value.value.table, 0);
	- break;
	- case AMQP_FIELD_KIND_UTF8:
	- if (entry->value.value.bytes.bytes) {
	- efree(entry->value.value.bytes.bytes);
	- }
	- break;
	- }
	- }
	- efree(object->entries);
	- }
	-
	- if (clear_root) {
	- efree(object);
	- }
	-}
	-
	-void php_amqp_free_amqp_table(amqp_table_t *object)
	-{
	- internal_php_amqp_free_amqp_table(object, 1);
	-}
	-
	-
	-PHP_INI_BEGIN()
	- PHP_INI_ENTRY("amqp.host", DEFAULT_HOST, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.vhost", DEFAULT_VHOST, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.port", DEFAULT_PORT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.timeout", DEFAULT_TIMEOUT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.read_timeout", DEFAULT_READ_TIMEOUT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.write_timeout", DEFAULT_WRITE_TIMEOUT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.connect_timeout", DEFAULT_CONNECT_TIMEOUT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.login", DEFAULT_LOGIN, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.password", DEFAULT_PASSWORD, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.auto_ack", DEFAULT_AUTOACK, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.prefetch_count", DEFAULT_PREFETCH_COUNT, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.channel_max", DEFAULT_CHANNEL_MAX, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.frame_max", DEFAULT_FRAME_MAX, PHP_INI_ALL, NULL)
	- PHP_INI_ENTRY("amqp.heartbeat", DEFAULT_HEARTBEAT, PHP_INI_ALL, NULL)
	-PHP_INI_END()
	-
	-/* {{{ PHP_MINIT_FUNCTION
	-*/
	-PHP_MINIT_FUNCTION(amqp)
	-{
	- zend_class_entry ce;
	-
	- /* Set up the connection resource */
	- le_amqp_connection_resource = zend_register_list_destructors_ex(amqp_connection_resource_dtor, NULL, PHP_AMQP_CONNECTION_RES_NAME, module_number);
	- le_amqp_connection_resource_persistent = zend_register_list_destructors_ex(NULL, amqp_connection_resource_dtor_persistent, PHP_AMQP_CONNECTION_RES_NAME, module_number);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPConnection", amqp_connection_class_functions);
	- ce.create_object = amqp_connection_ctor;
	- amqp_connection_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPChannel", amqp_channel_class_functions);
	- ce.create_object = amqp_channel_ctor;
	- amqp_channel_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPQueue", amqp_queue_class_functions);
	- ce.create_object = amqp_queue_ctor;
	- amqp_queue_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPExchange", amqp_exchange_class_functions);
	- ce.create_object = amqp_exchange_ctor;
	- amqp_exchange_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPEnvelope", amqp_envelope_class_functions);
	- ce.create_object = amqp_envelope_ctor;
	- amqp_envelope_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	-
	- /* Class Exceptions */
	- INIT_CLASS_ENTRY(ce, "AMQPException", NULL);
	- amqp_exception_class_entry = zend_register_internal_class_ex(&ce, (zend_class_entry*)zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPConnectionException", NULL);
	- amqp_connection_exception_class_entry = zend_register_internal_class_ex(&ce, amqp_exception_class_entry, NULL TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPChannelException", NULL);
	- amqp_channel_exception_class_entry = zend_register_internal_class_ex(&ce, amqp_exception_class_entry, NULL TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPQueueException", NULL);
	- amqp_queue_exception_class_entry = zend_register_internal_class_ex(&ce, amqp_exception_class_entry, NULL TSRMLS_CC);
	-
	- INIT_CLASS_ENTRY(ce, "AMQPExchangeException", NULL);
	- amqp_exchange_exception_class_entry = zend_register_internal_class_ex(&ce, amqp_exception_class_entry, NULL TSRMLS_CC);
	-
	- REGISTER_INI_ENTRIES();
	-
	- REGISTER_LONG_CONSTANT("AMQP_NOPARAM", AMQP_NOPARAM, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_JUST_CONSUME", AMQP_JUST_CONSUME, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_DURABLE", AMQP_DURABLE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_PASSIVE", AMQP_PASSIVE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_EXCLUSIVE", AMQP_EXCLUSIVE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_AUTODELETE", AMQP_AUTODELETE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_INTERNAL", AMQP_INTERNAL, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_NOLOCAL", AMQP_NOLOCAL, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_AUTOACK", AMQP_AUTOACK, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_IFEMPTY", AMQP_IFEMPTY, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_IFUNUSED", AMQP_IFUNUSED, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_MANDATORY", AMQP_MANDATORY, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_IMMEDIATE", AMQP_IMMEDIATE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_MULTIPLE", AMQP_MULTIPLE, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_NOWAIT", AMQP_NOWAIT, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("AMQP_REQUEUE", AMQP_REQUEUE, CONST_CS \| CONST_PERSISTENT);
	-
	- REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_DIRECT", AMQP_EX_TYPE_DIRECT, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_FANOUT", AMQP_EX_TYPE_FANOUT, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_TOPIC", AMQP_EX_TYPE_TOPIC, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_HEADERS",AMQP_EX_TYPE_HEADERS, CONST_CS \| CONST_PERSISTENT);
	-
	- REGISTER_LONG_CONSTANT("AMQP_OS_SOCKET_TIMEOUT_ERRNO", AMQP_OS_SOCKET_TIMEOUT_ERRNO, CONST_CS \| CONST_PERSISTENT);
	- REGISTER_LONG_CONSTANT("PHP_AMQP_MAX_CHANNELS", PHP_AMQP_MAX_CHANNELS, CONST_CS \| CONST_PERSISTENT);
	-
	- return SUCCESS;
	-}
	-/* }}} */
	-
	-/* {{{ PHP_MSHUTDOWN_FUNCTION
	-*/
	-PHP_MSHUTDOWN_FUNCTION(amqp)
	-{
	- UNREGISTER_INI_ENTRIES();
	-
	- return SUCCESS;
	-}
	-/* }}} */
	-
	-
	-/* {{{ PHP_MINFO_FUNCTION
	-*/
	-PHP_MINFO_FUNCTION(amqp)
	-{
	- php_info_print_table_start();
	- php_info_print_table_header(2, "Version", PHP_AMQP_VERSION);
	- php_info_print_table_header(2, "Revision", PHP_AMQP_REVISION);
	- php_info_print_table_header(2, "Compiled", __DATE__ " @ " __TIME__);
	- php_info_print_table_header(2, "AMQP protocol version", "0-9-1");
	- php_info_print_table_header(2, "librabbitmq version", amqp_version());
	- php_info_print_table_header(2, "Default max channels per connection", DEFAULT_CHANNEL_MAX);
	- php_info_print_table_header(2, "Default max frame size", DEFAULT_FRAME_MAX);
	- php_info_print_table_header(2, "Default heartbeats interval", DEFAULT_HEARTBEAT);
	- DISPLAY_INI_ENTRIES();
	-}
	-/* }}} */
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<600: noet sw=4 ts=4
	-*/
	diff --git a/amqp-1.6.1/amqp_channel.c b/amqp-1.6.1/amqp_channel.c
	deleted file mode 100644
	index aaccbfb..0000000
	--- a/amqp-1.6.1/amqp_channel.c
	+++ /dev/null
	@@ -1,744 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp_channel.c 318036 2011-10-11 20:30:46Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <stdint.h>
	-# include <signal.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-#include "php_amqp.h"
	-#include "amqp_connection_resource.h"
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	-zend_object_handlers amqp_channel_object_handlers;
	-HashTable amqp_channel_object_get_debug_info(zval object, int *is_temp TSRMLS_DC) {
	- zval *value;
	- HashTable *debug_info;
	-
	- /* Get the envelope object from which to read */
	- amqp_channel_object channel = (amqp_channel_object )zend_object_store_get_object(object TSRMLS_CC);
	-
	- /* Let zend clean up for us: */
	- *is_temp = 1;
	-
	- /* Keep the first number matching the number of entries in this table*/
	- ALLOC_HASHTABLE(debug_info);
	- ZEND_INIT_SYMTABLE_EX(debug_info, 4 + 1, 0);
	-
	- /* Start adding values */
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, channel->channel_id);
	- zend_hash_add(debug_info, "channel_id", sizeof("channel_id"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, channel->prefetch_count);
	- zend_hash_add(debug_info, "prefetch_count", sizeof("prefetch_count"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, channel->prefetch_size);
	- zend_hash_add(debug_info, "prefetch_size", sizeof("prefetch_size"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, channel->is_connected);
	- zend_hash_add(debug_info, "is_connected", sizeof("is_connected"), &value, sizeof(zval *), NULL);
	-
	- /* Start adding values */
	- return debug_info;
	-}
	-#endif
	-
	-void php_amqp_close_channel(amqp_channel_object *channel TSRMLS_DC)
	-{
	- amqp_connection_object *connection;
	-
	- assert(channel != NULL);
	-
	- /* Pull out and verify the connection */
	- connection = AMQP_GET_CONNECTION(channel);
	-
	- if (connection != NULL) {
	- /* First, remove it from active channels table to prevent recursion in case of connection error */
	- php_amqp_connection_resource_unregister_channel(connection->connection_resource, channel->channel_id);
	- } else {
	- channel->is_connected = '\0';
	- }
	-
	- if (!channel->is_connected) {
	- /* Nothing to do more - channel was previously marked as closed, possibly, due to channel-level error */
	- return;
	- }
	-
	- channel->is_connected = '\0';
	-
	- if (connection->connection_resource && connection->connection_resource->is_connected) {
	- assert(connection->connection_resource != NULL);
	-
	- amqp_channel_close(connection->connection_resource->connection_state, channel->channel_id, AMQP_REPLY_SUCCESS);
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- }
	-}
	-
	-
	-void amqp_channel_dtor(void *object TSRMLS_DC)
	-{
	- amqp_channel_object channel = (amqp_channel_object)object;
	-
	- if (channel->is_connected) {
	- php_amqp_close_channel(channel TSRMLS_CC);
	- }
	-
	- if (channel->connection != NULL) {
	- /* Destroy the connection storage */
	- zval_ptr_dtor(&channel->connection);
	- }
	-
	- zend_object_std_dtor(&channel->zo TSRMLS_CC);
	-
	- efree(object);
	-}
	-
	-zend_object_value amqp_channel_ctor(zend_class_entry *ce TSRMLS_DC)
	-{
	- zend_object_value new_value;
	- amqp_channel_object channel = (amqp_channel_object)emalloc(sizeof(amqp_channel_object));
	-
	- memset(channel, 0, sizeof(amqp_channel_object));
	-
	- zend_object_std_init(&channel->zo, ce TSRMLS_CC);
	- AMQP_OBJECT_PROPERTIES_INIT(channel->zo, ce);
	-
	- new_value.handle = zend_objects_store_put(
	- channel,
	- (zend_objects_store_dtor_t)zend_objects_destroy_object,
	- (zend_objects_free_object_storage_t)amqp_channel_dtor,
	- NULL TSRMLS_CC
	- );
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	- memcpy((void )&amqp_channel_object_handlers, (void )zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	- amqp_channel_object_handlers.get_debug_info = amqp_channel_object_get_debug_info;
	- new_value.handlers = &amqp_channel_object_handlers;
	-#else
	- new_value.handlers = zend_get_std_object_handlers();
	-#endif
	-
	- return new_value;
	-}
	-
	-
	-/* {{{ proto AMQPChannel::__construct(AMQPConnection obj)
	- */
	-PHP_METHOD(amqp_channel_class, __construct)
	-{
	- zval *id;
	- zval *connection_object = NULL;
	-
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- /* Parse out the method parameters */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, amqp_channel_class_entry, &connection_object, amqp_connection_class_entry) == FAILURE) {
	- zend_throw_exception(amqp_channel_exception_class_entry, "Parameter must be an instance of AMQPConnection.", 0 TSRMLS_CC);
	- RETURN_NULL();
	- }
	-
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	- channel->connection = connection_object;
	-
	- Z_ADDREF_P(connection_object);
	-
	- /* Set the prefetch count */
	- channel->prefetch_count = INI_INT("amqp.prefetch_count");
	-
	- /* Pull out and verify the connection */
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not create channel.");
	-
	- /* Figure out what the next available channel is on this connection */
	- channel->channel_id = php_amqp_connection_resource_get_available_channel_id(connection->connection_resource);
	-
	- /* Check that we got a valid channel */
	- if (!channel->channel_id) {
	- zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. Connection has no open channel slots remaining.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- if (php_amqp_connection_resource_register_channel(connection->connection_resource, channel, channel->channel_id) == FAILURE) {
	- zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. Failed to add channel to connection slot.", 0 TSRMLS_CC);
	- }
	-
	- /* Open up the channel for use */
	- amqp_channel_open_ok_t *r = amqp_channel_open(connection->connection_resource->connection_state, channel->channel_id);
	-
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	-
	- php_amqp_connection_resource_unregister_channel(connection->connection_resource, channel->channel_id);
	- channel->channel_id = 0;
	- return;
	- }
	-
	- /* r->channel_id is a 16-bit channel number insibe amqp_bytes_t, assertion below will without converting to uint16_t*/
	- /* assert (r->channel_id == channel->channel_id);*/
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- channel->is_connected = '\1';
	-
	- /* Set the prefetch count: */
	- amqp_basic_qos(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- 0, /* prefetch window size */
	- channel->prefetch_count, /* prefetch message count */
	- /* NOTE that RabbitMQ has reinterpreted global flag field. See https://www.rabbitmq.com/amqp-0-9-1-reference.html#basic.qos.global for details */
	- 0 /* global flag */
	- );
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto bool amqp::isConnected()
	-check amqp channel */
	-PHP_METHOD(amqp_channel_class, isConnected)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* If the channel_connect is 1, we have a channel */
	- if (channel->is_connected == '\1') {
	- RETURN_TRUE;
	- }
	-
	- /* We have no channel */
	- RETURN_FALSE;
	-}
	-/* }}} */
	-
	-/* {{{ proto bool amqp::getChannelId()
	-get amqp channel ID */
	-PHP_METHOD(amqp_channel_class, getChannelId)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(channel->channel_id);
	-}
	-/* }}} */
	-
	-/* {{{ proto bool amqp::setPrefetchCount(long count)
	-set the number of prefetches */
	-PHP_METHOD(amqp_channel_class, setPrefetchCount)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	- long prefetch_count;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, amqp_channel_class_entry, &prefetch_count) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not set prefetch count.");
	-
	- /* If we are already connected, set the new prefetch count */
	- if (channel->is_connected) {
	- amqp_basic_qos(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- 0,
	- prefetch_count,
	- 0
	- );
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- }
	-
	- /* Set the prefetch count - the implication is to disable the size */
	- channel->prefetch_count = prefetch_count;
	- channel->prefetch_size = 0;
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto long amqp::setPrefetchCount()
	-get the number of prefetches */
	-PHP_METHOD(amqp_channel_class, getPrefetchCount)
	-{
	- amqp_channel_object *channel;
	-
	- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
	- return;
	- }
	-
	- channel = (amqp_channel_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
	-
	- RETURN_LONG(channel->prefetch_count);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto bool amqp::setPrefetchSize(long size)
	-set the number of prefetches */
	-PHP_METHOD(amqp_channel_class, setPrefetchSize)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	- long prefetch_size;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, amqp_channel_class_entry, &prefetch_size) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not set prefetch size.");
	-
	- /* If we are already connected, set the new prefetch count */
	- if (channel->is_connected) {
	- amqp_basic_qos(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- prefetch_size,
	- 0,
	- 0
	- );
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- }
	-
	- /* Set the prefetch size - the implication is to disable the count */
	- channel->prefetch_count = 0;
	- channel->prefetch_size = prefetch_size;
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto long amqp::getPrefetchSize()
	-get the number of prefetches */
	-PHP_METHOD(amqp_channel_class, getPrefetchSize)
	-{
	- amqp_channel_object *channel;
	-
	- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
	-
	- RETURN_LONG(channel->prefetch_size);
	-}
	-/* }}} */
	-
	-
	-
	-/* {{{ proto amqp::qos(long size, long count)
	-set the number of prefetches */
	-PHP_METHOD(amqp_channel_class, qos)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	- long prefetch_size;
	- long prefetch_count;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, amqp_channel_class_entry, &prefetch_size, &prefetch_count) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Set the prefetch size - the implication is to disable the count */
	- channel->prefetch_size = prefetch_size;
	- channel->prefetch_count = prefetch_count;
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not set qos parameters.");
	-
	- /* If we are already connected, set the new prefetch count */
	- if (channel->is_connected) {
	- amqp_basic_qos(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- channel->prefetch_size,
	- channel->prefetch_count,
	- /* NOTE that RabbitMQ has reinterpreted global flag field. See https://www.rabbitmq.com/amqp-0-9-1-reference.html#basic.qos.global for details */
	- 0 /* Global flag - whether this change should affect every channel */
	- );
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::startTransaction()
	-start a transaction on the given channel */
	-PHP_METHOD(amqp_channel_class, startTransaction)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- amqp_rpc_reply_t res;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not start the transaction.");
	-
	- amqp_tx_select(
	- connection->connection_resource->connection_state,
	- channel->channel_id
	- );
	-
	- res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::startTransaction()
	-start a transaction on the given channel */
	-PHP_METHOD(amqp_channel_class, commitTransaction)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- amqp_rpc_reply_t res;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not start the transaction.");
	-
	- amqp_tx_commit(
	- connection->connection_resource->connection_state,
	- channel->channel_id
	- );
	-
	- res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::startTransaction()
	-start a transaction on the given channel */
	-PHP_METHOD(amqp_channel_class, rollbackTransaction)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- amqp_rpc_reply_t res;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not start the transaction.");
	-
	- amqp_tx_rollback(
	- connection->connection_resource->connection_state,
	- channel->channel_id
	- );
	-
	- res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPChannel::getConnection()
	-Get the AMQPConnection object in use */
	-PHP_METHOD(amqp_channel_class, getConnection)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_channel_class_entry) == FAILURE) {
	- return;
	- }
	-
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_ZVAL(channel->connection, 1, 0);
	-}
	-/* }}} */
	-
	-/* {{{ proto bool amqp::basicRecover([bool requeue=TRUE])
	-Redeliver unacknowledged messages */
	-PHP_METHOD(amqp_channel_class, basicRecover)
	-{
	- zval *id;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- amqp_rpc_reply_t res;
	-
	- zend_bool requeue = 1;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|b", &id, amqp_channel_class_entry, &requeue) == FAILURE) {
	- return;
	- }
	-
	- /* Get the channel object out of the store */
	- channel = (amqp_channel_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not redeliver unacknowledged messages.");
	-
	- amqp_basic_recover(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- (amqp_boolean_t) requeue
	- );
	-
	- res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-
	-}
	-/* }}} */
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<600: noet sw=4 ts=4
	-*/
	diff --git a/amqp-1.6.1/amqp_connection.c b/amqp-1.6.1/amqp_connection.c
	deleted file mode 100644
	index a325e44..0000000
	--- a/amqp-1.6.1/amqp_connection.c
	+++ /dev/null
	@@ -1,1444 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp_connection.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <signal.h>
	-# include <stdint.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-#include <amqp_tcp_socket.h>
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-#include "php_amqp.h"
	-#include "amqp_channel.h"
	-#include "amqp_connection_resource.h"
	-
	-#ifndef E_DEPRECATED
	-#define E_DEPRECATED E_WARNING
	-#endif
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	-zend_object_handlers amqp_connection_object_handlers;
	-HashTable amqp_connection_object_get_debug_info(zval object, int *is_temp TSRMLS_DC) {
	- zval *value;
	- HashTable *debug_info;
	- amqp_connection_object *connection;
	-
	- /* Let zend clean up for us: */
	- *is_temp = 1;
	-
	- /* Get the envelope object from which to read */
	- connection = (amqp_connection_object *)zend_object_store_get_object(object TSRMLS_CC);
	-
	- /* Keep the first number matching the number of entries in this table*/
	- ALLOC_HASHTABLE(debug_info);
	- ZEND_INIT_SYMTABLE_EX(debug_info, 15 + 1, 0);
	-
	- /* Start adding values */
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, connection->login, strlen(connection->login), 1);
	- zend_hash_add(debug_info, "login", sizeof("login"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, connection->password, strlen(connection->password), 1);
	- zend_hash_add(debug_info, "password", sizeof("password"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, connection->host, strlen(connection->host), 1);
	- zend_hash_add(debug_info, "host", sizeof("host"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, connection->vhost, strlen(connection->vhost), 1);
	- zend_hash_add(debug_info, "vhost", sizeof("vhost"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, connection->port);
	- zend_hash_add(debug_info, "port", sizeof("port"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_DOUBLE(value, connection->read_timeout);
	- zend_hash_add(debug_info, "read_timeout", sizeof("read_timeout"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_DOUBLE(value, connection->write_timeout);
	- zend_hash_add(debug_info, "write_timeout", sizeof("write_timeout"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_DOUBLE(value, connection->connect_timeout);
	- zend_hash_add(debug_info, "connect_timeout", sizeof("connect_timeout"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, connection->is_connected);
	- zend_hash_add(debug_info, "is_connected", sizeof("is_connected"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, connection->is_persistent);
	- zend_hash_add(debug_info, "is_persistent", sizeof("is_persistent"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	-
	- if (connection && connection->connection_resource) {
	- ZVAL_RESOURCE(value, connection->connection_resource->resource_id);
	- zend_list_addref(connection->connection_resource->resource_id);
	- } else {
	- ZVAL_NULL(value);
	- }
	- zend_hash_add(debug_info, "connection_resource", sizeof("connection_resource"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- if (connection->connection_resource) {
	- ZVAL_LONG(value, connection->connection_resource->used_slots);
	- } else {
	- ZVAL_NULL(value);
	- }
	- zend_hash_add(debug_info, "used_channels", sizeof("used_channels"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- if (connection->connection_resource) {
	- ZVAL_LONG(value, amqp_get_channel_max(connection->connection_resource->connection_state));
	- } else {
	- ZVAL_NULL(value);
	- }
	- zend_hash_add(debug_info, "max_channel_id", sizeof("max_channel_id"), &value, sizeof(zval *), NULL);
	-
	-#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	- MAKE_STD_ZVAL(value);
	- if (connection->connection_resource) {
	- ZVAL_LONG(value, amqp_get_frame_max(connection->connection_resource->connection_state));
	- } else {
	- ZVAL_NULL(value);
	- }
	- zend_hash_add(debug_info, "max_frame_size", sizeof("max_frame_size"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- if (connection->connection_resource) {
	- ZVAL_LONG(value, amqp_get_heartbeat(connection->connection_resource->connection_state));
	- } else {
	- ZVAL_NULL(value);
	- }
	- zend_hash_add(debug_info, "heartbeat_interval", sizeof("heartbeat_interval"), &value, sizeof(zval *), NULL);
	-#endif
	-
	- /* Start adding values */
	- return debug_info;
	-}
	-#endif
	-
	-
	-static void php_amqp_prepare_for_disconnect(amqp_connection_object *connection TSRMLS_DC)
	-{
	- amqp_channel_object *channel;
	-
	- /* Pull the connection resource out for easy access */
	- amqp_connection_resource *resource = connection->connection_resource;
	-
	- if (!resource) {
	- return;
	- }
	-
	- assert(resource->slots != NULL);
	-
	- /* NOTE: when we have persistent connection we do not move channels between php requests
	- * due to current php-amqp extension limitation in AMQPChannel where __construct == channel.open AMQP method call
	- * and __destruct = channel.close AMQP method call
	- */
	-
	- /* Clean up old memory allocations which are now invalid (new connection) */
	- amqp_channel_t slot;
	-
	- for (slot = 0; slot < resource->max_slots; slot++) {
	- if (resource->slots[slot] != 0) {
	- php_amqp_close_channel(resource->slots[slot] TSRMLS_CC);
	- }
	- }
	-
	- /* If it's persistent connection do not destroy connection resource (this keep connection alive) */
	- if (connection->is_persistent) {
	- /* Cleanup buffers to reduce memory usage in idle mode */
	- amqp_maybe_release_buffers(resource->connection_state);
	- }
	-
	- return;
	-}
	-
	-void php_amqp_disconnect_safe(amqp_connection_object *connection TSRMLS_DC)
	-{
	- php_amqp_prepare_for_disconnect(connection TSRMLS_CC);
	-
	- if (connection->is_persistent) {
	- connection->connection_resource->resource_id = 0;
	- }
	-
	- if(connection->connection_resource && connection->connection_resource->resource_id > 0) {
	- zend_list_delete(connection->connection_resource->resource_id);
	- }
	-
	- /* Mark connection as closed */
	- connection->connection_resource = NULL;
	- connection->is_connected = '\0';
	- connection->is_persistent = '\0';
	-}
	-
	-void php_amqp_disconnect_force(amqp_connection_object *connection TSRMLS_DC)
	-{
	- php_amqp_prepare_for_disconnect(connection TSRMLS_CC);
	-
	- if(connection->connection_resource) {
	-
	- if (connection->connection_resource->resource_id > 0) {
	- zend_list_delete(connection->connection_resource->resource_id);
	- }
	-
	- if (connection->is_persistent) {
	- zend_rsrc_list_entry *le;
	-
	- if (zend_hash_find(&EG(persistent_list), connection->connection_resource->resource_key, connection->connection_resource->resource_key_len + 1, (void **)&le) == SUCCESS) {
	- if (Z_TYPE_P(le) == le_amqp_connection_resource_persistent) {
	- zend_hash_del(&EG(persistent_list), connection->connection_resource->resource_key, connection->connection_resource->resource_key_len + 1);
	- }
	- }
	- }
	- }
	-
	- /* Mark connection as closed */
	- connection->connection_resource = NULL;
	- connection->is_connected = '\0';
	- connection->is_persistent = '\0';
	-}
	-
	-/**
	- * php_amqp_connect
	- * handles connecting to amqp
	- * called by connect(), pconnect(), reconnect(), preconnect()
	- */
	-int php_amqp_connect(amqp_connection_object *connection, int persistent TSRMLS_DC)
	-{
	- char *key;
	- int key_len;
	-
	- /* Clean up old memory allocations which are now invalid (new connection) */
	- assert(connection->connection_resource == NULL);
	- assert(!connection->is_connected);
	-
	- if (persistent) {
	- zend_rsrc_list_entry *le;
	- /* Look for an established resource */
	- key_len = spprintf(&key, 0,
	- "amqp_conn_res_%s_%d_%s_%s_%s_%d_%d_%d",
	- connection->host,
	- connection->port,
	- connection->vhost,
	- connection->login,
	- connection->password,
	- connection->frame_max,
	- connection->channel_max,
	- connection->heartbeat
	- );
	-
	- if (zend_hash_find(&EG(persistent_list), key, key_len + 1, (void **)&le) == SUCCESS) {
	- efree(key);
	-
	- if (Z_TYPE_P(le) != le_amqp_connection_resource_persistent) {
	- /* hash conflict, given name associate with non-amqp persistent connection resource */
	- return 0;
	- }
	-
	- /* An entry for this connection resource already exists */
	- /* Stash the connection resource in the connection */
	- connection->connection_resource = le->ptr;
	-
	- if (connection->connection_resource->resource_id > 0) {
	- /* resource in use! */
	- connection->connection_resource = NULL;
	-
	- zend_throw_exception(amqp_connection_exception_class_entry, "There are already established persistent connection to the same resource.", 0 TSRMLS_CC);
	- return 0;
	- }
	-
	- connection->connection_resource->resource_id = ZEND_REGISTER_RESOURCE(NULL, connection->connection_resource, persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource);
	-
	- /* Set desired timeouts */
	- if (php_amqp_set_resource_read_timeout(connection->connection_resource, connection->read_timeout TSRMLS_CC) == 0
	- \|\| php_amqp_set_resource_write_timeout(connection->connection_resource, connection->write_timeout TSRMLS_CC) == 0) {
	-
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	-
	- connection->connection_resource = NULL;
	- return 0;
	- }
	-
	-
	- /* Set connection status to connected */
	- connection->is_connected = '\1';
	- connection->is_persistent = persistent;
	-
	- return 1;
	- }
	-
	- efree(key);
	- }
	-
	- connection->connection_resource = connection_resource_constructor(connection, persistent TSRMLS_CC);
	-
	- if (!connection->connection_resource) {
	- return 0;
	- }
	-
	- connection->connection_resource->resource_id = ZEND_REGISTER_RESOURCE(NULL, connection->connection_resource, persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource);
	-
	- /* Set connection status to connected */
	- connection->is_connected = '\1';
	-
	- if (persistent) {
	- zend_rsrc_list_entry new_le;
	-
	- connection->is_persistent = persistent;
	-
	- key_len = spprintf(&key, 0,
	- "amqp_conn_res_%s_%d_%s_%s_%s_%d_%d_%d",
	- connection->host,
	- connection->port,
	- connection->vhost,
	- connection->login,
	- connection->password,
	- connection->frame_max,
	- connection->channel_max,
	- connection->heartbeat
	- );
	-
	- connection->connection_resource->resource_key = pestrndup(key, key_len, persistent);
	- connection->connection_resource->resource_key_len = key_len;
	-
	- efree(key);
	-
	- /* Store a reference in the persistence list */
	- new_le.ptr = connection->connection_resource;
	- new_le.type = persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource;
	-
	- if (FAILURE == zend_hash_add(&EG(persistent_list), connection->connection_resource->resource_key, connection->connection_resource->resource_key_len + 1, &new_le, sizeof(zend_rsrc_list_entry), NULL)) {
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	- return 0;
	- }
	- }
	-
	- return 1;
	-}
	-
	-void amqp_connection_dtor(void *object TSRMLS_DC)
	-{
	- amqp_connection_object connection = (amqp_connection_object)object;
	-
	- php_amqp_disconnect_safe(connection TSRMLS_CC);
	-
	- assert(connection->connection_resource == NULL);
	-
	- /* Clean up all the strings */
	- if (connection->host) {
	- efree(connection->host);
	- }
	-
	- if (connection->vhost) {
	- efree(connection->vhost);
	- }
	-
	- if (connection->login) {
	- efree(connection->login);
	- }
	-
	- if (connection->password) {
	- efree(connection->password);
	- }
	-
	- zend_object_std_dtor(&connection->zo TSRMLS_CC);
	-
	- efree(object);
	-}
	-
	-zend_object_value amqp_connection_ctor(zend_class_entry *ce TSRMLS_DC)
	-{
	- zend_object_value new_value;
	-
	- amqp_connection_object* connection = (amqp_connection_object*)emalloc(sizeof(amqp_connection_object));
	- memset(connection, 0, sizeof(amqp_connection_object));
	-
	- zend_object_std_init(&connection->zo, ce TSRMLS_CC);
	- AMQP_OBJECT_PROPERTIES_INIT(connection->zo, ce);
	-
	- new_value.handle = zend_objects_store_put(
	- connection,
	- (zend_objects_store_dtor_t)zend_objects_destroy_object,
	- (zend_objects_free_object_storage_t)amqp_connection_dtor,
	- NULL TSRMLS_CC
	- );
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	- memcpy((void )&amqp_connection_object_handlers, (void )zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	- amqp_connection_object_handlers.get_debug_info = amqp_connection_object_get_debug_info;
	- new_value.handlers = &amqp_connection_object_handlers;
	-#else
	- new_value.handlers = zend_get_std_object_handlers();
	-#endif
	- return new_value;
	-}
	-
	-
	-/* {{{ proto AMQPConnection::__construct([array optional])
	- * The array can contain 'host', 'port', 'login', 'password', 'vhost', 'read_timeout', 'write_timeout', 'connect_timeout' and 'timeout' (deprecated) indexes
	- */
	-PHP_METHOD(amqp_connection_class, __construct)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- zval* ini_arr = NULL;
	- zval** zdata;
	-
	- /* Parse out the method parameters */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|a", &id, amqp_connection_class_entry, &ini_arr) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the connection off of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Pull the login out of the $params array */
	- zdata = NULL;
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "login", sizeof("login"), (void*)&zdata)) {
	- convert_to_string(*zdata);
	- }
	- /* Validate the given login */
	- if (zdata && Z_STRLEN_PP(zdata) > 0) {
	- if (Z_STRLEN_PP(zdata) < 128) {
	- connection->login = estrndup(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata));
	- } else {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'login' exceeds 128 character limit.", 0 TSRMLS_CC);
	- return;
	- }
	- } else {
	- connection->login = estrndup(INI_STR("amqp.login"), strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login")));
	- }
	-
	- /* Pull the password out of the $params array */
	- zdata = NULL;
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF(ini_arr), "password", sizeof("password"), (void*)&zdata)) {
	- convert_to_string(*zdata);
	- }
	- /* Validate the given password */
	- if (zdata && Z_STRLEN_PP(zdata) > 0) {
	- if (Z_STRLEN_PP(zdata) < 128) {
	- connection->password = estrndup(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata));
	- } else {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'password' exceeds 128 character limit.", 0 TSRMLS_CC);
	- return;
	- }
	- } else {
	- connection->password = estrndup(INI_STR("amqp.password"), strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.password")));
	- }
	-
	- /* Pull the host out of the $params array */
	- zdata = NULL;
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF(ini_arr), "host", sizeof("host"), (void *)&zdata)) {
	- convert_to_string(*zdata);
	- }
	- /* Validate the given host */
	- if (zdata && Z_STRLEN_PP(zdata) > 0) {
	- if (Z_STRLEN_PP(zdata) < 128) {
	- connection->host = estrndup(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata));
	- } else {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'host' exceeds 128 character limit.", 0 TSRMLS_CC);
	- return;
	- }
	- } else {
	- connection->host = estrndup(INI_STR("amqp.host"), strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host")));
	- }
	-
	- /* Pull the vhost out of the $params array */
	- zdata = NULL;
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "vhost", sizeof("vhost"), (void*)&zdata)) {
	- convert_to_string(*zdata);
	- }
	- /* Validate the given vhost */
	- if (zdata && Z_STRLEN_PP(zdata) > 0) {
	- if (Z_STRLEN_PP(zdata) < 128) {
	- connection->vhost = estrndup(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata));
	- } else {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 character limit.", 0 TSRMLS_CC);
	- return;
	- }
	- } else {
	- connection->vhost = estrndup(INI_STR("amqp.vhost"), strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost")));
	- }
	-
	- connection->port = INI_INT("amqp.port");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "port", sizeof("port"), (void*)&zdata)) {
	- convert_to_long(*zdata);
	- connection->port = (size_t)Z_LVAL_PP(zdata);
	- }
	-
	- connection->read_timeout = INI_FLT("amqp.read_timeout");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "read_timeout", sizeof("read_timeout"), (void*)&zdata)) {
	- convert_to_double(*zdata);
	- if (Z_DVAL_PP(zdata) < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- } else {
	- connection->read_timeout = Z_DVAL_PP(zdata);
	- }
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "timeout", sizeof("timeout"), (void*)&zdata)) {
	- /* 'read_timeout' takes precedence on 'timeout' but users have to know this */
	- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Parameter 'timeout' is deprecated, 'read_timeout' used instead");
	- }
	-
	- } else if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "timeout", sizeof("timeout"), (void*)&zdata)) {
	-
	- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Parameter 'timeout' is deprecated; use 'read_timeout' instead");
	-
	- convert_to_double(*zdata);
	- if (Z_DVAL_PP(zdata) < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- } else {
	- connection->read_timeout = Z_DVAL_PP(zdata);
	- }
	- } else {
	-
	- assert(DEFAULT_TIMEOUT != NULL);
	- if (strcmp(DEFAULT_TIMEOUT, INI_STR("amqp.timeout")) != 0) {
	- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "INI setting 'amqp.timeout' is deprecated; use 'amqp.read_timeout' instead");
	-
	- if (strcmp(DEFAULT_READ_TIMEOUT, INI_STR("amqp.read_timeout")) == 0) {
	- connection->read_timeout = INI_FLT("amqp.timeout");
	- } else {
	- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "INI setting 'amqp.read_timeout' will be used instead of 'amqp.timeout'");
	- connection->read_timeout = INI_FLT("amqp.read_timeout");
	- }
	- } else {
	- connection->read_timeout = INI_FLT("amqp.read_timeout");
	- }
	- }
	-
	- connection->write_timeout = INI_FLT("amqp.write_timeout");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "write_timeout", sizeof("write_timeout"), (void*)&zdata)) {
	- convert_to_double(*zdata);
	- if (Z_DVAL_PP(zdata) < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- } else {
	- connection->write_timeout = Z_DVAL_PP(zdata);
	- }
	- }
	-
	- connection->connect_timeout = INI_FLT("amqp.connect_timeout");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "connect_timeout", sizeof("connect_timeout"), (void*)&zdata)) {
	- convert_to_double(*zdata);
	- if (Z_DVAL_PP(zdata) < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'connect_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- } else {
	- connection->connect_timeout = Z_DVAL_PP(zdata);
	- }
	- }
	-
	- connection->channel_max = (int) INI_INT("amqp.channel_max");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "channel_max", sizeof("channel_max"), (void*)&zdata)) {
	- convert_to_long(*zdata);
	- if (Z_LVAL_PP(zdata) < 0 \|\| Z_LVAL_PP(zdata) > PHP_AMQP_MAX_CHANNELS) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'channel_max' is out of range.", 0 TSRMLS_CC);
	- } else {
	- connection->channel_max = (int) Z_LVAL_PP(zdata);
	- if(connection->channel_max == 0) {
	- connection->channel_max = PHP_AMQP_DEFAULT_CHANNEL_MAX;
	- }
	-
	- }
	- }
	-
	- connection->frame_max = (int) INI_INT("amqp.frame_max");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "frame_max", sizeof("frame_max"), (void*)&zdata)) {
	- convert_to_long(*zdata);
	- if (Z_LVAL_PP(zdata) < 0 \|\| Z_LVAL_PP(zdata) > PHP_AMQP_MAX_FRAME) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'frame_max' is out of range.", 0 TSRMLS_CC);
	- } else {
	- connection->frame_max = (int) Z_LVAL_PP(zdata);
	- if(connection->frame_max == 0) {
	- connection->frame_max = PHP_AMQP_DEFAULT_FRAME_MAX;
	- }
	- }
	- }
	-
	- connection->heartbeat = (int) INI_INT("amqp.heartbeat");
	-
	- if (ini_arr && SUCCESS == zend_hash_find(HASH_OF (ini_arr), "heartbeat", sizeof("heartbeat"), (void*)&zdata)) {
	- convert_to_long(*zdata);
	- if (Z_LVAL_PP(zdata) < 0 \|\| Z_LVAL_PP(zdata) > PHP_AMQP_MAX_HEARTBEAT) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'heartbeat' is out of range.", 0 TSRMLS_CC);
	- } else {
	- connection->heartbeat = (int) Z_LVAL_PP(zdata);
	- }
	- }
	-
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::isConnected()
	-check amqp connection */
	-PHP_METHOD(amqp_connection_class, isConnected)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* If the channel_connect is 1, we have a connection */
	- if (connection->is_connected == '\1') {
	- RETURN_TRUE;
	- }
	-
	- /* We have no connection */
	- RETURN_FALSE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::connect()
	-create amqp connection */
	-PHP_METHOD(amqp_connection_class, connect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (connection->is_connected) {
	-
	- assert(connection->connection_resource != NULL);
	- if (connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to start transient connection while persistent transient one already established. Continue.");
	- }
	-
	- RETURN_TRUE;
	- }
	-
	- /* Actually connect this resource to the broker */
	- RETURN_BOOL(php_amqp_connect(connection, 0 TSRMLS_CC));
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::connect()
	-create amqp connection */
	-PHP_METHOD(amqp_connection_class, pconnect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (connection->is_connected) {
	-
	- assert(connection->connection_resource != NULL);
	- if (!connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to start persistent connection while transient one already established. Continue.");
	- }
	-
	- RETURN_TRUE;
	- }
	-
	- /* Actually connect this resource to the broker or use stored connection */
	- RETURN_BOOL(php_amqp_connect(connection, 1 TSRMLS_CC));
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp:pdisconnect()
	-destroy amqp persistent connection */
	-PHP_METHOD(amqp_connection_class, pdisconnect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- RETURN_TRUE;
	- }
	-
	- assert(connection->connection_resource != NULL);
	-
	- if (!connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close persistent connection while transient one already established. Abort.");
	-
	- RETURN_FALSE;
	- }
	-
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::disconnect()
	-destroy amqp connection */
	-PHP_METHOD(amqp_connection_class, disconnect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- RETURN_TRUE;
	- }
	-
	- if (connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close transient connection while persistent one already established. Abort.");
	-
	- RETURN_FALSE;
	- }
	-
	- assert(connection->connection_resource != NULL);
	-
	- php_amqp_disconnect_safe(connection TSRMLS_CC);
	-
	- RETURN_TRUE;
	-}
	-
	-/* }}} */
	-
	-/* {{{ proto amqp::reconnect()
	-recreate amqp connection */
	-PHP_METHOD(amqp_connection_class, reconnect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (connection->is_connected == '\1') {
	-
	- assert(connection->connection_resource != NULL);
	-
	- if (connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to reconnect persistent connection while transient one already established. Abort.");
	-
	- RETURN_FALSE;
	- }
	-
	- php_amqp_disconnect_safe(connection TSRMLS_CC);
	- }
	-
	- RETURN_BOOL(php_amqp_connect(connection, 0 TSRMLS_CC));
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::preconnect()
	-recreate amqp connection */
	-PHP_METHOD(amqp_connection_class, preconnect)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	-
	- if (connection->is_connected == '\1') {
	-
	- assert(connection->connection_resource != NULL);
	-
	- if (!connection->is_persistent) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to reconnect transient connection while persistent one already established. Abort.");
	-
	- RETURN_FALSE;
	- }
	-
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	- }
	-
	- RETURN_BOOL(php_amqp_connect(connection, 1 TSRMLS_CC));
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::getLogin()
	-get the login */
	-PHP_METHOD(amqp_connection_class, getLogin)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the login from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the login to the amqp object */
	- RETURN_STRING(connection->login, 1);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::setLogin(string login)
	-set the login */
	-PHP_METHOD(amqp_connection_class, setLogin)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- char *login;
	- int login_len;
	-
	- /* Get the login from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_connection_class_entry, &login, &login_len) == FAILURE) {
	- return;
	- }
	-
	- /* Validate login length */
	- if (login_len > 128) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'login' given, exceeds 128 characters limit.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Free previously existing login, in cases where setLogin() is called multiple times */
	- if (connection->login) {
	- efree(connection->login);
	- }
	-
	- /* Copy the login to the amqp object */
	- connection->login = estrndup(login, login_len);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getPassword()
	-get the password */
	-PHP_METHOD(amqp_connection_class, getPassword)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the password from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the password to the amqp object */
	- RETURN_STRING(connection->password, 1);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::setPassword(string password)
	-set the password */
	-PHP_METHOD(amqp_connection_class, setPassword)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- char *password;
	- int password_len;
	-
	- /* Get the password from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_connection_class_entry, &password, &password_len) == FAILURE) {
	- return;
	- }
	-
	- /* Validate password length */
	- if (password_len > 128) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'password' given, exceeds 128 characters limit.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Free previously existing password, in cases where setPassword() is called multiple times */
	- if (connection->password) {
	- efree(connection->password);
	- }
	-
	- /* Copy the password to the amqp object */
	- connection->password = estrndup(password, password_len);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::getHost()
	-get the host */
	-PHP_METHOD(amqp_connection_class, getHost)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the host from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the host to the amqp object */
	- RETURN_STRING(connection->host, 1);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::setHost(string host)
	-set the host */
	-PHP_METHOD(amqp_connection_class, setHost)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- char *host;
	- int host_len;
	-
	- /* Get the host from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_connection_class_entry, &host, &host_len) == FAILURE) {
	- return;
	- }
	-
	- /* Validate host length */
	- if (host_len > 1024) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'host' given, exceeds 1024 character limit.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Free previously existing host, in cases where setHost() is called multiple times */
	- if (connection->host) {
	- efree(connection->host);
	- }
	-
	- /* Copy the host to the amqp object */
	- connection->host = estrndup(host, host_len);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::getPort()
	-get the port */
	-PHP_METHOD(amqp_connection_class, getPort)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the port from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the port to the amqp object */
	- RETURN_LONG(connection->port);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::setPort(mixed port)
	-set the port */
	-PHP_METHOD(amqp_connection_class, setPort)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- zval *zvalPort;
	- int port;
	-
	- /* Get the port from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz", &id, amqp_connection_class_entry, &zvalPort) == FAILURE) {
	- return;
	- }
	-
	- /* Parse out the port*/
	- switch (Z_TYPE_P(zvalPort)) {
	- case IS_DOUBLE:
	- port = (int)Z_DVAL_P(zvalPort);
	- break;
	- case IS_LONG:
	- port = (int)Z_LVAL_P(zvalPort);
	- break;
	- case IS_STRING:
	- convert_to_long(zvalPort);
	- port = (int)Z_LVAL_P(zvalPort);
	- break;
	- default:
	- port = 0;
	- }
	-
	- /* Check the port value */
	- if (port <= 0 \|\| port > 65535) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Invalid port given. Value must be between 1 and 65535.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the port to the amqp object */
	- connection->port = port;
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getVhost()
	-get the vhost */
	-PHP_METHOD(amqp_connection_class, getVhost)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the vhost to the amqp object */
	- RETURN_STRING(connection->vhost, 1);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto amqp::setVhost(string vhost)
	-set the vhost */
	-PHP_METHOD(amqp_connection_class, setVhost)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- char *vhost;
	- int vhost_len;
	-
	- /* Get the vhost from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_connection_class_entry, &vhost, &vhost_len) == FAILURE) {
	- return;
	- }
	-
	- /* Validate vhost length */
	- if (vhost_len > 128) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 characters limit.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Free previously existing vhost, in cases where setVhost() is called multiple times */
	- if (connection->vhost) {
	- efree(connection->vhost);
	- }
	-
	- /* Copy the vhost to the amqp object */
	- connection->vhost = estrndup(vhost, vhost_len);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getTimeout()
	-@deprecated
	-get the timeout */
	-PHP_METHOD(amqp_connection_class, getTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "AMQPConnection::getTimeout() method is deprecated; use AMQPConnection::getReadTimeout() instead");
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- RETURN_DOUBLE(connection->read_timeout);
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::setTimeout(double timeout)
	-@deprecated
	-set the timeout */
	-PHP_METHOD(amqp_connection_class, setTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- double read_timeout;
	-
	- php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "AMQPConnection::setTimeout($timeout) method is deprecated; use AMQPConnection::setReadTimeout($timeout) instead");
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Od", &id, amqp_connection_class_entry, &read_timeout) == FAILURE) {
	- return;
	- }
	-
	- /* Validate timeout */
	- if (read_timeout < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- connection->read_timeout = read_timeout;
	-
	- if (connection->is_connected == '\1') {
	- if (php_amqp_set_resource_read_timeout(connection->connection_resource, connection->read_timeout TSRMLS_CC) == 0) {
	-
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	- RETURN_FALSE;
	- }
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getReadTimeout()
	-get the read timeout */
	-PHP_METHOD(amqp_connection_class, getReadTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- RETURN_DOUBLE(connection->read_timeout);
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::setReadTimeout(double timeout)
	-set read timeout */
	-PHP_METHOD(amqp_connection_class, setReadTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- double read_timeout;
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Od", &id, amqp_connection_class_entry, &read_timeout) == FAILURE) {
	- return;
	- }
	-
	- /* Validate timeout */
	- if (read_timeout < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- connection->read_timeout = read_timeout;
	-
	- if (connection->is_connected == '\1') {
	- if (php_amqp_set_resource_read_timeout(connection->connection_resource, connection->read_timeout TSRMLS_CC) == 0) {
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	-
	- RETURN_FALSE;
	- }
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getWriteTimeout()
	-get write timeout */
	-PHP_METHOD(amqp_connection_class, getWriteTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- RETURN_DOUBLE(connection->write_timeout);
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::setWriteTimeout(double timeout)
	-set write timeout */
	-PHP_METHOD(amqp_connection_class, setWriteTimeout)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	- double write_timeout;
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Od", &id, amqp_connection_class_entry, &write_timeout) == FAILURE) {
	- return;
	- }
	-
	- /* Validate timeout */
	- if (write_timeout < 0) {
	- zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Copy the timeout to the amqp object */
	- connection->write_timeout = write_timeout;
	-
	- if (connection->is_connected == '\1') {
	- if (php_amqp_set_resource_write_timeout(connection->connection_resource, connection->write_timeout TSRMLS_CC) == 0) {
	-
	- php_amqp_disconnect_force(connection TSRMLS_CC);
	- RETURN_FALSE;
	- }
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getUsedChannels()
	-Get max used channels number */
	-PHP_METHOD(amqp_connection_class, getUsedChannels)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- /* Get the timeout from the method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	-
	- RETURN_LONG(0);
	- }
	-
	- RETURN_LONG(connection->connection_resource->used_slots);
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getMaxChannels()
	-Get max supported channels number per connection */
	-PHP_METHOD(amqp_connection_class, getMaxChannels)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	-
	- RETURN_NULL();
	- }
	-
	- RETURN_LONG(connection->connection_resource->max_slots);
	-}
	-/* }}} */
	-
	-#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	-/* {{{ proto amqp::getMaxFrameSize()
	-Get max supported frame size per connection in bytes */
	-PHP_METHOD(amqp_connection_class, getMaxFrameSize)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	-
	- RETURN_NULL();
	- }
	-
	- RETURN_LONG(amqp_get_frame_max(connection->connection_resource->connection_state));
	-}
	-/* }}} */
	-
	-/* {{{ proto amqp::getHeartbeatInterval()
	-Get number of seconds between heartbeats of the connection in seconds */
	-PHP_METHOD(amqp_connection_class, getHeartbeatInterval)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (!connection->is_connected) {
	- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	-
	- RETURN_NULL();
	- }
	-
	- RETURN_LONG(amqp_get_heartbeat(connection->connection_resource->connection_state));
	-}
	-/* }}} */
	-#endif
	-
	-/* {{{ proto amqp::isPersistent()
	-check whether amqp connection is persistent */
	-PHP_METHOD(amqp_connection_class, isPersistent)
	-{
	- zval *id;
	- amqp_connection_object *connection;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the connection object out of the store */
	- connection = (amqp_connection_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_BOOL(connection->is_persistent);
	-}
	-/* }}} */
	-
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<6
	-*/
	diff --git a/amqp-1.6.1/amqp_envelope.c b/amqp-1.6.1/amqp_envelope.c
	deleted file mode 100644
	index b7ec417..0000000
	--- a/amqp-1.6.1/amqp_envelope.c
	+++ /dev/null
	@@ -1,595 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp_envelope.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <signal.h>
	-# include <stdint.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-#include "php_amqp.h"
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	-zend_object_handlers amqp_envelope_object_handlers;
	-HashTable amqp_envelope_object_get_debug_info(zval object, int *is_temp TSRMLS_DC) {
	- zval *value;
	- HashTable *debug_info;
	-
	- /* Get the envelope object from which to read */
	- amqp_envelope_object envelope = (amqp_envelope_object )zend_object_store_get_object(object TSRMLS_CC);
	-
	- /* Let zend clean up for us: */
	- *is_temp = 1;
	-
	- /* Keep the # 18 matching the number of entries in this table*/
	- ALLOC_HASHTABLE(debug_info);
	- ZEND_INIT_SYMTABLE_EX(debug_info, 18 + 1, 0);
	-
	- /* Start adding values */
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->body, envelope->body_len, 1);
	- zend_hash_add(debug_info, "body", sizeof("body"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->content_type, strlen(envelope->content_type), 1);
	- zend_hash_add(debug_info, "content_type", sizeof("content_type"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->routing_key, strlen(envelope->routing_key), 1);
	- zend_hash_add(debug_info, "routing_key", sizeof("routing_key"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, envelope->delivery_tag);
	- zend_hash_add(debug_info, "delivery_tag", sizeof("delivery_tag"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, envelope->delivery_mode);
	- zend_hash_add(debug_info, "delivery_mode", sizeof("delivery_mode"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->exchange_name, strlen(envelope->exchange_name), 1);
	- zend_hash_add(debug_info, "exchange_name", sizeof("exchange_name"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, envelope->is_redelivery);
	- zend_hash_add(debug_info, "is_redelivery", sizeof("is_redelivery"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->content_encoding, strlen(envelope->content_encoding), 1);
	- zend_hash_add(debug_info, "content_encoding", sizeof("content_encoding"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->type, strlen(envelope->type), 1);
	- zend_hash_add(debug_info, "type", sizeof("type"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, envelope->timestamp);
	- zend_hash_add(debug_info, "timestamp", sizeof("timestamp"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_LONG(value, envelope->priority);
	- zend_hash_add(debug_info, "priority", sizeof("priority"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->expiration, strlen(envelope->expiration), 1);
	- zend_hash_add(debug_info, "expiration", sizeof("expiration"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->user_id, strlen(envelope->user_id), 1);
	- zend_hash_add(debug_info, "user_id", sizeof("user_id"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->app_id, strlen(envelope->app_id), 1);
	- zend_hash_add(debug_info, "app_id", sizeof("app_id"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->message_id, strlen(envelope->message_id), 1);
	- zend_hash_add(debug_info, "message_id", sizeof("message_id"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->reply_to, strlen(envelope->reply_to), 1);
	- zend_hash_add(debug_info, "reply_to", sizeof("reply_to"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, envelope->correlation_id, strlen(envelope->correlation_id), 1);
	- zend_hash_add(debug_info, "correlation_id", sizeof("correlation_id"), &value, sizeof(zval *), NULL);
	-
	- Z_ADDREF_P(envelope->headers);
	- zend_hash_add(debug_info, "headers", sizeof("headers"), &envelope->headers, sizeof(envelope->headers), NULL);
	-
	- return debug_info;
	-}
	-#endif
	-
	-void amqp_envelope_dtor(void *object TSRMLS_DC)
	-{
	- amqp_envelope_object envelope = (amqp_envelope_object)object;
	-
	- if (envelope->headers) {
	- zval_ptr_dtor(&envelope->headers);
	- }
	-
	- if (envelope->body) {
	- efree(envelope->body);
	- }
	-
	- zend_object_std_dtor(&envelope->zo TSRMLS_CC);
	-
	- efree(object);
	-}
	-
	-zend_object_value amqp_envelope_ctor(zend_class_entry *ce TSRMLS_DC)
	-{
	- zend_object_value new_value;
	- amqp_envelope_object envelope = (amqp_envelope_object)emalloc(sizeof(amqp_envelope_object));
	-
	- memset(envelope, 0, sizeof(amqp_envelope_object));
	-
	- MAKE_STD_ZVAL(envelope->headers);
	- array_init(envelope->headers);
	-
	- zend_object_std_init(&envelope->zo, ce TSRMLS_CC);
	- AMQP_OBJECT_PROPERTIES_INIT(envelope->zo, ce);
	-
	- new_value.handle = zend_objects_store_put(envelope, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t)amqp_envelope_dtor, NULL TSRMLS_CC);
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	- memcpy((void )&amqp_envelope_object_handlers, (void )zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	- amqp_envelope_object_handlers.get_debug_info = amqp_envelope_object_get_debug_info;
	- new_value.handlers = &amqp_envelope_object_handlers;
	-#else
	- new_value.handlers = zend_get_std_object_handlers();
	-#endif
	-
	- return new_value;
	-}
	-
	-/* {{{ proto AMQPEnvelope::__construct(AMQPConnection obj)
	- */
	-PHP_METHOD(amqp_envelope_class, __construct)
	-{
	- zval *id;
	-
	- amqp_envelope_object *envelope;
	-
	- /* Parse out the method parameters */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPEnvelope::getBody()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getBody)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (envelope->body == 0) {
	- RETURN_FALSE;
	- }
	-
	- RETURN_STRINGL(envelope->body, envelope->body_len, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getRoutingKey()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getRoutingKey)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->routing_key, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getDeliveryMode()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getDeliveryMode)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(envelope->delivery_mode);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPEnvelope::getDeliveryTag()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getDeliveryTag)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(envelope->delivery_tag);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getExchangeName()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getExchangeName)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->exchange_name, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::isRedelivery()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, isRedelivery)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* We have no envelope */
	- RETURN_BOOL(envelope->is_redelivery);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getContentType()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getContentType)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->content_type, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getContentEncoding()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getContentEncoding)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->content_encoding, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getType()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getType)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->type, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getTimestamp()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getTimestamp)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(envelope->timestamp);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getPriority()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getPriority)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(envelope->priority);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getExpiration()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getExpiration)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->expiration, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getUserId()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getUserId)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->user_id, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getAppId()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getAppId)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->app_id, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getMessageId()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getMessageId)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->message_id, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getReplyTo()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getReplyTo)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->reply_to, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getCorrelationId()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getCorrelationId)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_STRING(envelope->correlation_id, 1);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPEnvelope::getHeader(string headerName)
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getHeader)
	-{
	- zval *id;
	- zval **tmp;
	- amqp_envelope_object *envelope;
	- char *key;
	- int key_len;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_envelope_class_entry, &key, &key_len) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Look for the hash key */
	- if (zend_hash_find(HASH_OF(envelope->headers), key, key_len + 1, (void **)&tmp) == FAILURE) {
	- RETURN_FALSE;
	- }
	-
	- return_value = *tmp;
	- zval_copy_ctor(return_value);
	- INIT_PZVAL(return_value);
	-
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPEnvelope::getHeaders()
	-check amqp envelope */
	-PHP_METHOD(amqp_envelope_class, getHeaders)
	-{
	- zval *id;
	- amqp_envelope_object *envelope;
	-
	- /* Try to pull amqp object out of method params */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_envelope_class_entry) == FAILURE) {
	- return;
	- }
	-
	- /* Get the envelope object out of the store */
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- zval_dtor(return_value);
	- MAKE_COPY_ZVAL(&envelope->headers, return_value);
	-}
	-/* }}} */
	-
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<600: noet sw=4 ts=4
	-*/
	diff --git a/amqp-1.6.1/amqp_exchange.c b/amqp-1.6.1/amqp_exchange.c
	deleted file mode 100644
	index 6161557..0000000
	--- a/amqp-1.6.1/amqp_exchange.c
	+++ /dev/null
	@@ -1,979 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp_exchange.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <signal.h>
	-# include <stdint.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-#include "php_amqp.h"
	-
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	-zend_object_handlers amqp_exchange_object_handlers;
	-HashTable amqp_exchange_object_get_debug_info(zval object, int *is_temp TSRMLS_DC) {
	- zval *value;
	- HashTable *debug_info;
	-
	- /* Get the envelope object from which to read */
	- amqp_exchange_object exchange = (amqp_exchange_object )zend_object_store_get_object(object TSRMLS_CC);
	-
	- /* Let zend clean up for us: */
	- *is_temp = 1;
	-
	- /* Keep the first number matching the number of entries in this table*/
	- ALLOC_HASHTABLE(debug_info);
	- ZEND_INIT_SYMTABLE_EX(debug_info, 6 + 1, 0);
	-
	- /* Start adding values */
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, exchange->name, strlen(exchange->name), 1);
	- zend_hash_add(debug_info, "name", sizeof("name"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, exchange->type, strlen(exchange->type), 1);
	- zend_hash_add(debug_info, "type", sizeof("type"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_PASSIVE(exchange->flags));
	- zend_hash_add(debug_info, "passive", sizeof("passive"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_DURABLE(exchange->flags));
	- zend_hash_add(debug_info, "durable", sizeof("durable"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_AUTODELETE(exchange->flags));
	- zend_hash_add(debug_info, "auto_delete", sizeof("auto_delete"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_INTERNAL(exchange->flags));
	- zend_hash_add(debug_info, "internal", sizeof("internal"), &value, sizeof(zval *), NULL);
	-
	- Z_ADDREF_P(exchange->arguments);
	- zend_hash_add(debug_info, "arguments", sizeof("arguments"), &exchange->arguments, sizeof(&exchange->arguments), NULL);
	-
	- /* Start adding values */
	- return debug_info;
	-}
	-#endif
	-
	-void amqp_exchange_dtor(void *object TSRMLS_DC)
	-{
	- amqp_exchange_object exchange = (amqp_exchange_object)object;
	-
	- /* Destroy the connection object */
	- if (exchange->channel) {
	- zval_ptr_dtor(&exchange->channel);
	- }
	-
	- if (exchange->arguments) {
	- zval_ptr_dtor(&exchange->arguments);
	- }
	-
	- zend_object_std_dtor(&exchange->zo TSRMLS_CC);
	-
	- efree(object);
	-}
	-
	-zend_object_value amqp_exchange_ctor(zend_class_entry *ce TSRMLS_DC)
	-{
	- zend_object_value new_value;
	- amqp_exchange_object* exchange = (amqp_exchange_object*)emalloc(sizeof(amqp_exchange_object));
	-
	- memset(exchange, 0, sizeof(amqp_exchange_object));
	-
	- /* Initialize the arguments array: */
	- MAKE_STD_ZVAL(exchange->arguments);
	- array_init(exchange->arguments);
	-
	- zend_object_std_init(&exchange->zo, ce TSRMLS_CC);
	- AMQP_OBJECT_PROPERTIES_INIT(exchange->zo, ce);
	-
	- new_value.handle = zend_objects_store_put(
	- exchange,
	- (zend_objects_store_dtor_t)zend_objects_destroy_object,
	- (zend_objects_free_object_storage_t)amqp_exchange_dtor,
	- NULL TSRMLS_CC
	- );
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	- memcpy((void )&amqp_exchange_object_handlers, (void )zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	- amqp_exchange_object_handlers.get_debug_info = amqp_exchange_object_get_debug_info;
	- new_value.handlers = &amqp_exchange_object_handlers;
	-#else
	- new_value.handlers = zend_get_std_object_handlers();
	-#endif
	-
	- return new_value;
	-}
	-
	-/* {{{ proto AMQPExchange::__construct(AMQPChannel channel);
	-create Exchange */
	-PHP_METHOD(amqp_exchange_class, __construct)
	-{
	- zval *id;
	- zval *channelObj;
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, amqp_exchange_class_entry, &channelObj, amqp_channel_class_entry) == FAILURE) {
	- zend_throw_exception(amqp_exchange_exception_class_entry, "Parameter must be an instance of AMQPChannel.", 0 TSRMLS_CC);
	- RETURN_NULL();
	- }
	-
	- if (!instanceof_function(Z_OBJCE_P(channelObj), amqp_channel_class_entry TSRMLS_CC)) {
	- zend_throw_exception(amqp_exchange_exception_class_entry, "The first parameter must be and instance of AMQPChannel.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- exchange->channel = channelObj;
	-
	- /* Increment the ref count */
	- Z_ADDREF_P(channelObj);
	-
	- /* Pull the channel out */
	- channel = AMQP_GET_CHANNEL(exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not create exchange.");
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::getName()
	-Get the exchange name */
	-PHP_METHOD(amqp_exchange_class, getName)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Check if there is a name to be had: */
	- if (exchange->name_len) {
	- RETURN_STRING(exchange->name, 1);
	- } else {
	- RETURN_FALSE;
	- }
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::setName(string name)
	-Set the exchange name */
	-PHP_METHOD(amqp_exchange_class, setName)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	- char *name = NULL;
	- int name_len = 0;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_exchange_class_entry, &name, &name_len) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the exchange off the object store */
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Verify that the name is not null and not an empty string */
	- if (name_len > 255) {
	- zend_throw_exception(amqp_exchange_exception_class_entry, "Invalid exchange name given, must be less than 255 characters long.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Set the exchange name */
	- AMQP_SET_NAME(exchange, name);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::getFlags()
	-Get the exchange parameters */
	-PHP_METHOD(amqp_exchange_class, getFlags)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(exchange->flags);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::setFlags(long bitmask)
	-Set the exchange parameters */
	-PHP_METHOD(amqp_exchange_class, setFlags)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	- long flagBitmask;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, amqp_exchange_class_entry, &flagBitmask) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the exchange off the object store */
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Set the flags based on the bitmask we were given */
	- exchange->flags = flagBitmask ? flagBitmask & PHP_AMQP_EXCHANGE_FLAGS : flagBitmask;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::getType()
	-Get the exchange type */
	-PHP_METHOD(amqp_exchange_class, getType)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Check if there is a type to be had: */
	- if (exchange->type_len) {
	- RETURN_STRING(exchange->type, 1);
	- } else {
	- RETURN_FALSE;
	- }
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::setType(string type)
	-Set the exchange type */
	-PHP_METHOD(amqp_exchange_class, setType)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	- char *type = NULL;
	- int type_len = 0;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_exchange_class_entry, &type, &type_len) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the exchange off the object store */
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- AMQP_SET_TYPE(exchange, type);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::getArgument(string key)
	-Get the exchange argument referenced by key */
	-PHP_METHOD(amqp_exchange_class, getArgument)
	-{
	- zval *id;
	- zval **tmp;
	- amqp_exchange_object *exchange;
	- char *key;
	- int key_len;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_exchange_class_entry, &key, &key_len) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (zend_hash_find(Z_ARRVAL_P(exchange->arguments), key, key_len + 1, (void **)&tmp) == FAILURE) {
	- RETURN_FALSE;
	- }
	-
	- return_value = *tmp;
	-
	- zval_copy_ctor(return_value);
	- INIT_PZVAL(return_value);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::getArguments
	-Get the exchange arguments */
	-PHP_METHOD(amqp_exchange_class, getArguments)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- zval_dtor(return_value);
	- MAKE_COPY_ZVAL(&exchange->arguments, return_value);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::setArguments(array args)
	-Overwrite all exchange arguments with given args */
	-PHP_METHOD(amqp_exchange_class, setArguments)
	-{
	- zval id, zvalArguments;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa", &id, amqp_exchange_class_entry, &zvalArguments) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the exchange off the object store */
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Destroy the arguments storage */
	- if (exchange->arguments) {
	- zval_ptr_dtor(&exchange->arguments);
	- }
	-
	- exchange->arguments = zvalArguments;
	-
	- /* Increment the ref count */
	- Z_ADDREF_P(exchange->arguments);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::setArgument(key, value)
	-Get the exchange name */
	-PHP_METHOD(amqp_exchange_class, setArgument)
	-{
	- zval id, value;
	- amqp_exchange_object *exchange;
	- char *key;
	- int key_len;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz", &id, amqp_exchange_class_entry, &key, &key_len, &value) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the exchange off the object store */
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- switch (Z_TYPE_P(value)) {
	- case IS_NULL:
	- zend_hash_del_key_or_index(Z_ARRVAL_P(exchange->arguments), key, key_len + 1, 0, HASH_DEL_KEY);
	- break;
	- case IS_BOOL:
	- case IS_LONG:
	- case IS_DOUBLE:
	- case IS_STRING:
	- add_assoc_zval(exchange->arguments, key, value);
	- Z_ADDREF_P(value);
	- break;
	- default:
	- zend_throw_exception(amqp_exchange_exception_class_entry, "The value parameter must be of type NULL, int, double or string.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::declareExchange();
	-declare Exchange
	-*/
	-PHP_METHOD(amqp_exchange_class, declareExchange)
	-{
	- zval *id;
	-
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- amqp_table_t *arguments;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- AMQP_ASSIGN_CHANNEL(channel, exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not declare exchange.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not declare exchange.");
	-
	- /* Check that the exchange has a name */
	- if (exchange->name_len < 1) {
	- zend_throw_exception(amqp_exchange_exception_class_entry, "Could not declare exchange. Exchanges must have a name.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Check that the exchange has a name */
	- if (exchange->type_len < 1) {
	- zend_throw_exception(amqp_exchange_exception_class_entry, "Could not declare exchange. Exchanges must have a type.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- arguments = convert_zval_to_amqp_table(exchange->arguments TSRMLS_CC);
	-
	-#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	- amqp_exchange_declare(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(exchange->name),
	- amqp_cstring_bytes(exchange->type),
	- IS_PASSIVE(exchange->flags),
	- IS_DURABLE(exchange->flags),
	- IS_AUTODELETE(exchange->flags),
	- IS_INTERNAL(exchange->flags),
	- *arguments
	- );
	-#else
	- amqp_exchange_declare(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(exchange->name),
	- amqp_cstring_bytes(exchange->type),
	- IS_PASSIVE(exchange->flags),
	- IS_DURABLE(exchange->flags),
	- *arguments
	- );
	-#endif
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- php_amqp_free_amqp_table(arguments);
	-
	- /* handle any errors that occured outside of signals */
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::delete([string name[, long params]]);
	-delete Exchange
	-*/
	-PHP_METHOD(amqp_exchange_class, delete)
	-{
	- zval *id;
	-
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *name = 0;
	- int name_len = 0;
	-
	- long flags = 0;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|sl", &id, amqp_exchange_class_entry, &name, &name_len, &flags) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not delete exchange.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not delete exchange.");
	-
	- amqp_exchange_delete(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(name_len ? name : exchange->name),
	- (AMQP_IFUNUSED & flags) ? 1 : 0
	- );
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPExchange::publish(string msg, [string key, [int flags, [array headers]]]);
	-publish into Exchange
	-*/
	-PHP_METHOD(amqp_exchange_class, publish)
	-{
	- zval *id;
	- zval *ini_arr = NULL;
	- zval** ppztmp;
	- zval *ini_arr_tmp = NULL;
	-
	-
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *key_name = NULL;
	- int key_len = 0;
	-
	- char *msg;
	- int msg_len= 0;
	-
	- long flags = AMQP_NOPARAM;
	-
	-#ifndef PHP_WIN32
	- /* Storage for previous signal handler during SIGPIPE override */
	- void * old_handler;
	-#endif
	-
	- amqp_basic_properties_t props;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os\|sla", &id, amqp_exchange_class_entry, &msg, &msg_len, &key_name, &key_len, &flags, &ini_arr) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* By default (and for BC) content type is text/plain (may be skipped at all, then set props._flags to 0) */
	- props.content_type = amqp_cstring_bytes("text/plain");
	- props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG;
	-
	- props.headers.entries = 0;
	-
	- if (ini_arr) {
	- ALLOC_ZVAL(ini_arr_tmp);
	- MAKE_COPY_ZVAL(&ini_arr, ini_arr_tmp);
	- }
	-
	- {
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "content_type", sizeof("content_type"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.content_type = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_CONTENT_TYPE_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "content_encoding", sizeof("content_encoding"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.content_encoding = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_CONTENT_ENCODING_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "message_id", sizeof("message_id"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.message_id = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_MESSAGE_ID_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "user_id", sizeof("user_id"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.user_id = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_USER_ID_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "app_id", sizeof("app_id"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.app_id = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_APP_ID_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "delivery_mode", sizeof("delivery_mode"), (void*)&ppztmp)) {
	- convert_to_long(*ppztmp);
	-
	- props.delivery_mode = (uint8_t)Z_LVAL_PP(ppztmp);
	- props._flags \|= AMQP_BASIC_DELIVERY_MODE_FLAG;
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "priority", sizeof("priority"), (void*)&ppztmp)) {
	- convert_to_long(*ppztmp);
	-
	- props.priority = (uint8_t)Z_LVAL_PP(ppztmp);
	- props._flags \|= AMQP_BASIC_PRIORITY_FLAG;
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "timestamp", sizeof("timestamp"), (void*)&ppztmp)) {
	- convert_to_long(*ppztmp);
	-
	- props.timestamp = (uint64_t)Z_LVAL_PP(ppztmp);
	- props._flags \|= AMQP_BASIC_TIMESTAMP_FLAG;
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "expiration", sizeof("expiration"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.expiration = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_EXPIRATION_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "type", sizeof("type"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.type = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_TYPE_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "reply_to", sizeof("reply_to"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.reply_to = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_REPLY_TO_FLAG;
	- }
	- }
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF (ini_arr_tmp), "correlation_id", sizeof("correlation_id"), (void*)&ppztmp)) {
	- convert_to_string(*ppztmp);
	-
	- if (Z_STRLEN_PP(ppztmp) > 0) {
	- props.correlation_id = amqp_cstring_bytes((char *)Z_STRVAL_PP(ppztmp));
	- props._flags \|= AMQP_BASIC_CORRELATION_ID_FLAG;
	- }
	- }
	-
	- }
	-
	- amqp_table_t *headers = NULL;
	-
	- if (ini_arr_tmp && SUCCESS == zend_hash_find(HASH_OF(ini_arr_tmp), "headers", sizeof("headers"), (void*)&ppztmp)) {
	- convert_to_array(*ppztmp);
	-
	- headers = convert_zval_to_amqp_table(*ppztmp TSRMLS_CC);
	-
	- props._flags \|= AMQP_BASIC_HEADERS_FLAG;
	- props.headers = *headers;
	- }
	-
	- channel = AMQP_GET_CHANNEL(exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not publish to exchange.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not publish to exchange.");
	-
	-#ifndef PHP_WIN32
	- /* Start ignoring SIGPIPE */
	- old_handler = signal(SIGPIPE, SIG_IGN);
	-#endif
	-
	- /* NOTE: basic.publish is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	- int status = amqp_basic_publish(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- (exchange->name_len > 0 ? amqp_cstring_bytes(exchange->name) : amqp_empty_bytes), /* exchange */
	- (key_len > 0 ? amqp_cstring_bytes(key_name) : amqp_empty_bytes), /* routing key */
	- (AMQP_MANDATORY & flags) ? 1 : 0, /* mandatory */
	- (AMQP_IMMEDIATE & flags) ? 1 : 0, /* immediate */
	- &props,
	- php_amqp_long_string(msg, msg_len) /* message body */
	- );
	-
	- if (headers) {
	- php_amqp_free_amqp_table(headers);
	- }
	-
	- if (ini_arr_tmp) {
	- zval_dtor(ini_arr_tmp);
	- FREE_ZVAL(ini_arr_tmp);
	- }
	-
	-#ifndef PHP_WIN32
	- /* End ignoring of SIGPIPEs */
	- signal(SIGPIPE, old_handler);
	-#endif
	-
	- if (status != AMQP_STATUS_OK) {
	- /* Emulate library error */
	- amqp_rpc_reply_t res;
	- res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	- res.library_error = status;
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int exchange::bind(string srcExchangeName[, string routingKey, array arguments]);
	-bind exchange to exchange by routing key
	-*/
	-PHP_METHOD(amqp_exchange_class, bind)
	-{
	- zval id, zvalArguments = NULL;
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *src_name;
	- int src_name_len = 0;
	-
	- char *keyname;
	- int keyname_len = 0;
	-
	- int flags;
	-
	- amqp_table_t *arguments;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os\|sa", &id, amqp_exchange_class_entry, &src_name, &src_name_len, &keyname, &keyname_len, &zvalArguments) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not bind to exchange.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not bind to exchanges.");
	-
	- if (zvalArguments) {
	- arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	- }
	-
	- amqp_exchange_bind(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(exchange->name),
	- (src_name_len > 0 ? amqp_cstring_bytes(src_name) : amqp_empty_bytes),
	- (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	- (zvalArguments ? *arguments : amqp_empty_table)
	- );
	-
	- if (zvalArguments) {
	- php_amqp_free_amqp_table(arguments);
	- }
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto int exchange::unbind(string srcExchangeName[, string routingKey, array arguments]);
	-remove exchange to exchange binding by routing key
	-*/
	-PHP_METHOD(amqp_exchange_class, unbind)
	-{
	- zval id, zvalArguments = NULL;
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *src_name;
	- int src_name_len = 0;
	-
	- char *keyname;
	- int keyname_len = 0;
	-
	- int flags;
	-
	- amqp_table_t *arguments;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os\|sa", &id, amqp_exchange_class_entry, &src_name, &src_name_len, &keyname, &keyname_len, &zvalArguments) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(exchange);
	- AMQP_VERIFY_CHANNEL(channel, "Could not unbind from exchange.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not unbind from exchanges.");
	-
	- if (zvalArguments) {
	- arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	- }
	-
	- amqp_exchange_unbind(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(exchange->name),
	- (src_name_len > 0 ? amqp_cstring_bytes(src_name) : amqp_empty_bytes),
	- (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	- (zvalArguments ? *arguments : amqp_empty_table)
	- );
	-
	- if (zvalArguments) {
	- php_amqp_free_amqp_table(arguments);
	- }
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPExchange::getChannel()
	-Get the AMQPChannel object in use */
	-PHP_METHOD(amqp_exchange_class, getChannel)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_ZVAL(exchange->channel, 1, 0);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPExchange::getConnection()
	-Get the AMQPConnection object in use */
	-PHP_METHOD(amqp_exchange_class, getConnection)
	-{
	- zval *id;
	- amqp_exchange_object *exchange;
	- amqp_channel_object *channel;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_exchange_class_entry) == FAILURE) {
	- return;
	- }
	-
	- exchange = (amqp_exchange_object *)zend_object_store_get_object(id TSRMLS_CC);
	- channel = AMQP_GET_CHANNEL(exchange);
	-
	- RETURN_ZVAL(channel->connection, 1, 0);
	-}
	-/* }}} */
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<600: noet sw=4 ts=4
	-*/
	diff --git a/amqp-1.6.1/amqp_object_store.c b/amqp-1.6.1/amqp_object_store.c
	deleted file mode 100644
	index ce13691..0000000
	--- a/amqp-1.6.1/amqp_object_store.c
	+++ /dev/null
	@@ -1,22 +0,0 @@
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-
	-#include "amqp_object_store.h"
	-
	-void amqp_object_store_get_valid_object(const zval zobject TSRMLS_DC)
	-{
	- if(zobject == NULL) {
	- return NULL;
	- }
	-
	- zend_object_handle handle;
	- zend_object_store_bucket bucket;
	-
	- handle = Z_OBJ_HANDLE_P(zobject);
	- bucket = EG(objects_store).object_buckets[handle];
	-
	- return bucket.valid ? bucket.bucket.obj.object : NULL;
	-}
	diff --git a/amqp-1.6.1/amqp_object_store.h b/amqp-1.6.1/amqp_object_store.h
	deleted file mode 100644
	index e748f86..0000000
	--- a/amqp-1.6.1/amqp_object_store.h
	+++ /dev/null
	@@ -1,4 +0,0 @@
	-#ifndef AMQP_OBJECT_STORE_PATCH_H
	-#define AMQP_OBJECT_STORE_PATCH_H
	-void amqp_object_store_get_valid_object(const zval zobject TSRMLS_DC);
	-#endif
	diff --git a/amqp-1.6.1/amqp_queue.c b/amqp-1.6.1/amqp_queue.c
	deleted file mode 100644
	index 52a14fa..0000000
	--- a/amqp-1.6.1/amqp_queue.c
	+++ /dev/null
	@@ -1,1453 +0,0 @@
	-/*
	- +----------------------------------------------------------------------+
	- \| PHP Version 5 \|
	- +----------------------------------------------------------------------+
	- \| Copyright (c) 1997-2007 The PHP Group \|
	- +----------------------------------------------------------------------+
	- \| This source file is subject to version 3.01 of the PHP license, \|
	- \| that is bundled with this package in the file LICENSE, and is \|
	- \| available through the world-wide-web at the following url: \|
	- \| http://www.php.net/license/3_01.txt \|
	- \| If you did not receive a copy of the PHP license and are unable to \|
	- \| obtain it through the world-wide-web, please send a note to \|
	- \| license@php.net so we can mail you a copy immediately. \|
	- +----------------------------------------------------------------------+
	- \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	- \| Lead: \|
	- \| - Pieter de Zwart \|
	- \| Maintainers: \|
	- \| - Brad Rodriguez \|
	- \| - Jonathan Tansavatdi \|
	- +----------------------------------------------------------------------+
	-*/
	-
	-/* $Id: amqp_queue.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	-
	-#ifdef HAVE_CONFIG_H
	-#include "config.h"
	-#endif
	-
	-#include "php.h"
	-#include "php_ini.h"
	-#include "ext/standard/info.h"
	-#include "zend_exceptions.h"
	-
	-#ifdef PHP_WIN32
	-# include "win32/php_stdint.h"
	-# include "win32/signal.h"
	-#else
	-# include <signal.h>
	-# include <stdint.h>
	-#endif
	-#include <amqp.h>
	-#include <amqp_framing.h>
	-
	-#ifdef PHP_WIN32
	-# include "win32/unistd.h"
	-#else
	-# include <unistd.h>
	-#endif
	-
	-#include "php_amqp.h"
	-
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	-zend_object_handlers amqp_queue_object_handlers;
	-HashTable amqp_queue_object_get_debug_info(zval object, int *is_temp TSRMLS_DC) {
	- zval *value;
	- HashTable *debug_info;
	-
	- /* Get the envelope object from which to read */
	- amqp_queue_object queue = (amqp_queue_object )zend_object_store_get_object(object TSRMLS_CC);
	-
	- /* Let zend clean up for us: */
	- *is_temp = 1;
	-
	- /* Keep the # 7 matching the number of entries in this table*/
	- ALLOC_HASHTABLE(debug_info);
	- ZEND_INIT_SYMTABLE_EX(debug_info, 7 + 1, 0);
	-
	- /* Start adding values */
	- MAKE_STD_ZVAL(value);
	- ZVAL_STRINGL(value, queue->name, strlen(queue->name), 1);
	- zend_hash_add(debug_info, "queue_name", sizeof("queue_name"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- if (queue->consumer_tag_len > 0) {
	- ZVAL_STRINGL(value, queue->consumer_tag, strlen(queue->consumer_tag), 1);
	- } else {
	- ZVAL_NULL(value);
	- }
	-
	- zend_hash_add(debug_info, "consumer_tag", sizeof("consumer_tag"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_PASSIVE(queue->flags));
	- zend_hash_add(debug_info, "passive", sizeof("passive"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_DURABLE(queue->flags));
	- zend_hash_add(debug_info, "durable", sizeof("durable"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_EXCLUSIVE(queue->flags));
	- zend_hash_add(debug_info, "exclusive", sizeof("exclusive"), &value, sizeof(zval *), NULL);
	-
	- MAKE_STD_ZVAL(value);
	- ZVAL_BOOL(value, IS_AUTODELETE(queue->flags));
	- zend_hash_add(debug_info, "auto_delete", sizeof("auto_delete"), &value, sizeof(zval *), NULL);
	-
	- Z_ADDREF_P(queue->arguments);
	- zend_hash_add(debug_info, "arguments", sizeof("arguments"), &queue->arguments, sizeof(&queue->arguments), NULL);
	-
	- return debug_info;
	-}
	-#endif
	-
	-/* Used in ctor, so must be declated first */
	-void amqp_queue_dtor(void *object TSRMLS_DC)
	-{
	- amqp_queue_object queue = (amqp_queue_object)object;
	-
	- /* Destroy the connection object */
	- if (queue->channel) {
	- zval_ptr_dtor(&queue->channel);
	- }
	-
	- /* Destroy the arguments storage */
	- if (queue->arguments) {
	- zval_ptr_dtor(&queue->arguments);
	- }
	-
	- zend_object_std_dtor(&queue->zo TSRMLS_CC);
	-
	- /* Destroy this object */
	- efree(object);
	-}
	-
	-zend_object_value amqp_queue_ctor(zend_class_entry *ce TSRMLS_DC)
	-{
	- zend_object_value new_value;
	- amqp_queue_object* queue = (amqp_queue_object*)emalloc(sizeof(amqp_queue_object));
	-
	- memset(queue, 0, sizeof(amqp_queue_object));
	-
	- zend_object_std_init(&queue->zo, ce TSRMLS_CC);
	- AMQP_OBJECT_PROPERTIES_INIT(queue->zo, ce);
	-
	- /* Initialize the arguments array: */
	- MAKE_STD_ZVAL(queue->arguments);
	- array_init(queue->arguments);
	-
	- new_value.handle = zend_objects_store_put(
	- queue,
	- (zend_objects_store_dtor_t)zend_objects_destroy_object,
	- (zend_objects_free_object_storage_t)amqp_queue_dtor,
	- NULL TSRMLS_CC
	- );
	-
	-#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
	- memcpy((void )&amqp_queue_object_handlers, (void )zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	- amqp_queue_object_handlers.get_debug_info = amqp_queue_object_get_debug_info;
	- new_value.handlers = &amqp_queue_object_handlers;
	-#else
	- new_value.handlers = zend_get_std_object_handlers();
	-#endif
	-
	- return new_value;
	-}
	-
	-void parse_amqp_table(amqp_table_t table, zval result)
	-{
	- int i;
	- zval *value;
	-
	- assert(Z_TYPE_P(result) == IS_ARRAY);
	-
	- for (i = 0; i < table->num_entries; i++) {
	- MAKE_STD_ZVAL(value);
	-
	- amqp_table_entry_t *entry = &(table->entries[i]);
	- switch (entry->value.kind) {
	- case AMQP_FIELD_KIND_BOOLEAN:
	- ZVAL_BOOL(value, entry->value.value.boolean);
	- break;
	- case AMQP_FIELD_KIND_I8:
	- ZVAL_LONG(value, entry->value.value.i8);
	- break;
	- case AMQP_FIELD_KIND_U8:
	- ZVAL_LONG(value, entry->value.value.u8);
	- break;
	- case AMQP_FIELD_KIND_I16:
	- ZVAL_LONG(value, entry->value.value.i16);
	- break;
	- case AMQP_FIELD_KIND_U16:
	- ZVAL_LONG(value, entry->value.value.u16);
	- break;
	- case AMQP_FIELD_KIND_I32:
	- ZVAL_LONG(value, entry->value.value.i32);
	- break;
	- case AMQP_FIELD_KIND_U32:
	- ZVAL_LONG(value, entry->value.value.u32);
	- break;
	- case AMQP_FIELD_KIND_I64:
	- ZVAL_LONG(value, entry->value.value.i64);
	- break;
	- case AMQP_FIELD_KIND_U64:
	- ZVAL_LONG(value, entry->value.value.i64);
	- break;
	- case AMQP_FIELD_KIND_F32:
	- ZVAL_DOUBLE(value, entry->value.value.f32);
	- break;
	- case AMQP_FIELD_KIND_F64:
	- ZVAL_DOUBLE(value, entry->value.value.f64);
	- break;
	- case AMQP_FIELD_KIND_UTF8:
	- case AMQP_FIELD_KIND_BYTES:
	- ZVAL_STRINGL(value, entry->value.value.bytes.bytes, entry->value.value.bytes.len, 1);
	- break;
	- case AMQP_FIELD_KIND_ARRAY:
	- {
	- int j;
	- array_init(value);
	- for (j = 0; j < entry->value.value.array.num_entries; ++j) {
	- switch (entry->value.value.array.entries[j].kind) {
	- case AMQP_FIELD_KIND_UTF8:
	- add_next_index_stringl(
	- value,
	- entry->value.value.array.entries[j].value.bytes.bytes,
	- entry->value.value.array.entries[j].value.bytes.len,
	- 1
	- );
	- break;
	- case AMQP_FIELD_KIND_TABLE:
	- {
	- zval *subtable;
	- MAKE_STD_ZVAL(subtable);
	- array_init(subtable);
	- parse_amqp_table(
	- &(entry->value.value.array.entries[j].value.table),
	- subtable
	- );
	- add_next_index_zval(value, subtable);
	- }
	- break;
	- }
	- }
	- }
	- break;
	- case AMQP_FIELD_KIND_TABLE:
	- array_init(value);
	- parse_amqp_table(&(entry->value.value.table), value);
	- break;
	- case AMQP_FIELD_KIND_TIMESTAMP:
	- ZVAL_DOUBLE(value, entry->value.value.u64);
	- break;
	- case AMQP_FIELD_KIND_VOID:
	- case AMQP_FIELD_KIND_DECIMAL:
	- default:
	- ZVAL_NULL(value);
	- break;
	- }
	-
	- if (Z_TYPE_P(value) != IS_NULL) {
	- char *key = estrndup(entry->key.bytes, entry->key.len);
	- add_assoc_zval(result, key, value);
	- efree(key);
	- } else {
	- zval_dtor(value);
	- }
	- }
	- return;
	-}
	-
	-void convert_amqp_envelope_to_zval(amqp_envelope_t amqp_envelope, zval envelopeZval TSRMLS_DC)
	-{
	- amqp_envelope_object *envelope;
	-
	- /* Build the envelope */
	- object_init_ex(envelopeZval, amqp_envelope_class_entry);
	- envelope = (amqp_envelope_object *)zend_object_store_get_object(envelopeZval TSRMLS_CC);
	-
	- AMQP_SET_STR_PROPERTY(envelope->routing_key, amqp_envelope->routing_key.bytes, amqp_envelope->routing_key.len);
	- AMQP_SET_STR_PROPERTY(envelope->exchange_name, amqp_envelope->exchange.bytes, amqp_envelope->exchange.len);
	- AMQP_SET_LONG_PROPERTY(envelope->delivery_tag, amqp_envelope->delivery_tag);
	- AMQP_SET_BOOL_PROPERTY(envelope->is_redelivery, amqp_envelope->redelivered);
	-
	- amqp_basic_properties_t *p = &amqp_envelope->message.properties;
	- amqp_message_t *message = &amqp_envelope->message;
	-
	- if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->content_type, p->content_type.bytes, p->content_type.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_CONTENT_ENCODING_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->content_encoding, p->content_encoding.bytes, p->content_encoding.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_TYPE_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->type, p->type.bytes, p->type.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_TIMESTAMP_FLAG) {
	- AMQP_SET_LONG_PROPERTY(envelope->timestamp, p->timestamp);
	- }
	-
	- if (p->_flags & AMQP_BASIC_DELIVERY_MODE_FLAG) {
	- AMQP_SET_LONG_PROPERTY(envelope->delivery_mode, p->delivery_mode);
	- } else {
	- AMQP_SET_LONG_PROPERTY(envelope->delivery_mode, AMQP_DELIVERY_NONPERSISTENT);
	- }
	-
	- if (p->_flags & AMQP_BASIC_PRIORITY_FLAG) {
	- AMQP_SET_LONG_PROPERTY(envelope->priority, p->priority);
	- }
	-
	- if (p->_flags & AMQP_BASIC_EXPIRATION_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->expiration, p->expiration.bytes, p->expiration.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_USER_ID_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->user_id, p->user_id.bytes, p->user_id.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_APP_ID_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->app_id, p->app_id.bytes, p->app_id.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_MESSAGE_ID_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->message_id, p->message_id.bytes, p->message_id.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_REPLY_TO_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->reply_to, p->reply_to.bytes, p->reply_to.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_CORRELATION_ID_FLAG) {
	- AMQP_SET_STR_PROPERTY(envelope->correlation_id, p->correlation_id.bytes, p->correlation_id.len);
	- }
	-
	- if (p->_flags & AMQP_BASIC_HEADERS_FLAG) {
	- parse_amqp_table(&(p->headers), envelope->headers);
	- }
	-
	- envelope->body = estrndup(message->body.bytes, message->body.len);
	- envelope->body_len = message->body.len;
	-}
	-
	-/* {{{ proto AMQPQueue::__construct(AMQPChannel channel)
	-AMQPQueue constructor
	-*/
	-PHP_METHOD(amqp_queue_class, __construct)
	-{
	- zval *id;
	- zval *channelObj = NULL;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &id, amqp_queue_class_entry, &channelObj, amqp_channel_class_entry) == FAILURE) {
	- zend_throw_exception(amqp_queue_exception_class_entry, "Parameter must be an instance of AMQPChannel.", 0 TSRMLS_CC);
	- RETURN_NULL();
	- }
	-
	- /* Store the connection object for later */
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Store the channel object */
	- queue->channel = channelObj;
	-
	- /* Increment the ref count */
	- Z_ADDREF_P(channelObj);
	-
	- /* Pull the channel out */
	- channel = AMQP_GET_CHANNEL(queue);
	-
	- /* Check that the given connection has a channel, before trying to pull the connection off the stack */
	- AMQP_VERIFY_CHANNEL(channel, "Could not construct queue.");
	-
	- /* By default, the auto_delete flag should be set */
	- queue->flags = AMQP_AUTODELETE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPQueue::getName()
	-Get the queue name */
	-PHP_METHOD(amqp_queue_class, getName)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Check if there is a name to be had: */
	- if (queue->name_len) {
	- RETURN_STRING(queue->name, 1);
	- } else {
	- RETURN_FALSE;
	- }
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPQueue::setName(string name)
	-Set the queue name */
	-PHP_METHOD(amqp_queue_class, setName)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- char *name = NULL;
	- int name_len = 0;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_queue_class_entry, &name, &name_len) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the queue off the object store */
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Verify that the name is not null and not an empty string */
	- if (name_len < 1 \|\| name_len > 255) {
	- zend_throw_exception(amqp_queue_exception_class_entry, "Invalid queue name given, must be between 1 and 255 characters long.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- /* Set the queue name */
	- AMQP_SET_NAME(queue, name);
	-}
	-/* }}} */
	-
	-
	-
	-/* {{{ proto AMQPQueue::getFlags()
	-Get the queue parameters */
	-PHP_METHOD(amqp_queue_class, getFlags)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_LONG(queue->flags);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPQueue::setFlags(long bitmask)
	-Set the queue parameters */
	-PHP_METHOD(amqp_queue_class, setFlags)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- long flagBitmask;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, amqp_queue_class_entry, &flagBitmask) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the queue off the object store */
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Set the flags based on the bitmask we were given */
	- queue->flags = flagBitmask ? flagBitmask & PHP_AMQP_QUEUE_FLAGS : flagBitmask;
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPQueue::getArgument(string key)
	-Get the queue argument referenced by key */
	-PHP_METHOD(amqp_queue_class, getArgument)
	-{
	- zval *id;
	- zval **tmp;
	- amqp_queue_object *queue;
	- char *key;
	- int key_len;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, amqp_queue_class_entry, &key, &key_len) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- if (zend_hash_find(Z_ARRVAL_P(queue->arguments), key, key_len + 1, (void **)&tmp) == FAILURE) {
	- RETURN_FALSE;
	- }
	-
	- return_value = *tmp;
	- zval_copy_ctor(return_value);
	- INIT_PZVAL(return_value);
	-
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPQueue::getArguments
	-Get the queue arguments */
	-PHP_METHOD(amqp_queue_class, getArguments)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- zval_dtor(return_value);
	- MAKE_COPY_ZVAL(&queue->arguments, return_value);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPQueue::setArguments(array args)
	-Overwrite all queue arguments with given args */
	-PHP_METHOD(amqp_queue_class, setArguments)
	-{
	- zval id, arguments;
	- amqp_queue_object *queue;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oa", &id, amqp_queue_class_entry, &arguments) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the queue off the object store */
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Destroy the arguments storage */
	- if (queue->arguments) {
	- zval_ptr_dtor(&queue->arguments);
	- }
	-
	- MAKE_COPY_ZVAL(&arguments, queue->arguments);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto AMQPQueue::setArgument(key, value)
	-Get the queue name */
	-PHP_METHOD(amqp_queue_class, setArgument)
	-{
	- zval id, value;
	- amqp_queue_object *queue;
	- char *key;
	- int key_len;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osz", &id, amqp_queue_class_entry, &key, &key_len, &value) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the queue off the object store */
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- switch (Z_TYPE_P(value)) {
	- case IS_NULL:
	- zend_hash_del_key_or_index(Z_ARRVAL_P(queue->arguments), key, key_len + 1, 0, HASH_DEL_KEY);
	- break;
	- case IS_BOOL:
	- case IS_LONG:
	- case IS_DOUBLE:
	- case IS_STRING:
	- add_assoc_zval(queue->arguments, key, value);
	- Z_ADDREF_P(value);
	- break;
	- default:
	- zend_throw_exception(amqp_queue_exception_class_entry, "The value parameter must be of type NULL, int, double or string.", 0 TSRMLS_CC);
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::declareQueue();
	-declare queue
	-*/
	-PHP_METHOD(amqp_queue_class, declareQueue)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *name = "";
	- amqp_table_t *arguments;
	- long message_count;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- /* Make sure we have a queue name, even if its empty: */
	- if (queue->name_len < 1) {
	- AMQP_SET_NAME(queue, name);
	- }
	-
	- AMQP_ASSIGN_CHANNEL(channel, queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not declare queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not declare queue.");
	-
	- arguments = convert_zval_to_amqp_table(queue->arguments TSRMLS_CC);
	-
	- amqp_queue_declare_ok_t *r = amqp_queue_declare(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- IS_PASSIVE(queue->flags),
	- IS_DURABLE(queue->flags),
	- IS_EXCLUSIVE(queue->flags),
	- IS_AUTODELETE(queue->flags),
	- *arguments
	- );
	-
	- php_amqp_free_amqp_table(arguments);
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- message_count = r->message_count;
	-
	- /* Set the queue name, in case it is an autogenerated queue name */
	- name = stringify_bytes(r->queue);
	- AMQP_SET_NAME(queue, name);
	- efree(name);
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_LONG(message_count);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::bind(string exchangeName, [string routingKey, array arguments]);
	-bind queue to exchange by routing key
	-*/
	-PHP_METHOD(amqp_queue_class, bind)
	-{
	- zval id, zvalArguments = NULL;
	-
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *exchange_name;
	- int exchange_name_len;
	-
	- char *keyname = NULL;
	- int keyname_len = 0;
	-
	- amqp_table_t *arguments;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os\|sa", &id, amqp_queue_class_entry, &exchange_name, &exchange_name_len, &keyname, &keyname_len, &zvalArguments) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not bind queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not bind queue.");
	-
	- if (zvalArguments) {
	- arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	- }
	-
	- amqp_queue_bind(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- (exchange_name_len > 0 ? amqp_cstring_bytes(exchange_name) : amqp_empty_bytes),
	- (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	- (zvalArguments ? *arguments : amqp_empty_table)
	- );
	-
	- if (zvalArguments) {
	- php_amqp_free_amqp_table(arguments);
	- }
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::get([bit flags=AMQP_NOPARAM]);
	-read messages from queue
	-return array (messages)
	-*/
	-PHP_METHOD(amqp_queue_class, get)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	- zval *message;
	-
	- long flags = INI_INT("amqp.auto_ack") ? AMQP_AUTOACK : AMQP_NOPARAM;
	-
	- /* Parse out the method parameters */
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|l", &id, amqp_queue_class_entry, &flags) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not get messages from queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not get messages from queue.");
	-
	- amqp_rpc_reply_t res = amqp_basic_get(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- (AMQP_AUTOACK & flags) ? 1 : 0
	- );
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- if (AMQP_BASIC_GET_EMPTY_METHOD == res.reply.id) {
	- RETURN_FALSE;
	- }
	-
	- assert(AMQP_BASIC_GET_OK_METHOD == res.reply.id);
	-
	- /* Fill the envelope from response */
	- amqp_basic_get_ok_t *get_ok_method = res.reply.decoded;
	-
	- amqp_envelope_t envelope;
	-
	- envelope.channel = channel->channel_id;
	- envelope.consumer_tag = amqp_empty_bytes;
	- envelope.delivery_tag = get_ok_method->delivery_tag;
	- envelope.redelivered = get_ok_method->redelivered;
	- envelope.exchange = amqp_bytes_malloc_dup(get_ok_method->exchange);
	- envelope.routing_key = amqp_bytes_malloc_dup(get_ok_method->routing_key);
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- res = amqp_read_message(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- &envelope.message,
	- 0
	- );
	-
	- if (AMQP_RESPONSE_NORMAL != res.reply_type) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- amqp_destroy_envelope(&envelope);
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- MAKE_STD_ZVAL(message);
	- convert_amqp_envelope_to_zval(&envelope, message TSRMLS_CC);
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- amqp_destroy_envelope(&envelope);
	-
	- COPY_PZVAL_TO_ZVAL(*return_value, message);
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto array AMQPQueue::consume([callback, flags = <bitmask>, consumer_tag]);
	-consume the message
	-*/
	-PHP_METHOD(amqp_queue_class, consume)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- zend_fcall_info fci = empty_fcall_info;
	- zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
	-
	- amqp_table_t *arguments;
	-
	- char *consumer_tag;
	- int consumer_tag_len = 0;
	-
	- long flags = INI_INT("amqp.auto_ack") ? AMQP_AUTOACK : AMQP_NOPARAM;
	-
	- int call_result;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|f!ls", &id, amqp_queue_class_entry, &fci,
	- &fci_cache, &flags, &consumer_tag, &consumer_tag_len) == FAILURE) {
	- return;
	- }
	-
	- /* Pull the queue out */
	- queue = (amqp_queue_object *) zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not get channel.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not get connection.");
	-
	- if (!(AMQP_JUST_CONSUME & flags)) {
	- /* Setup the consume */
	- arguments = convert_zval_to_amqp_table(queue->arguments TSRMLS_CC);
	-
	- amqp_basic_consume_ok_t *r = amqp_basic_consume(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- (consumer_tag_len > 0 ? amqp_cstring_bytes(consumer_tag) : amqp_empty_bytes), /* Consumer tag */
	- (AMQP_NOLOCAL & flags) ? 1 : 0, /* No local */
	- (AMQP_AUTOACK & flags) ? 1 : 0, /* no_ack, aka AUTOACK */
	- IS_EXCLUSIVE(queue->flags),
	- *arguments
	- );
	-
	- php_amqp_free_amqp_table(arguments);
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- zend_throw_exception(amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- /* Set the consumer tag name, in case it is an autogenerated consumer tag name */
	- AMQP_SET_STR_PROPERTY(queue->consumer_tag, r->consumer_tag.bytes, r->consumer_tag.len);
	- queue->consumer_tag_len = r->consumer_tag.len;
	- }
	-
	- if (!ZEND_FCI_INITIALIZED(fci)) {
	- /* Callback not set, we have nothing to do - real consuming may happens later */
	- return;
	- }
	-
	- struct timeval tv = {0};
	- struct timeval *tv_ptr = &tv;
	-
	- if (connection->read_timeout > 0) {
	- tv.tv_sec = (long int) connection->read_timeout;
	- tv.tv_usec = (long int) ((connection->read_timeout - tv.tv_sec) * 1000000);
	- } else {
	- tv_ptr = NULL;
	- }
	-
	- while(1) {
	- /* Initialize the message */
	- zval *message;
	-
	- amqp_envelope_t envelope;
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- amqp_rpc_reply_t res = amqp_consume_message(connection->connection_resource->connection_state, &envelope, tv_ptr, 0);
	-
	- if (AMQP_RESPONSE_LIBRARY_EXCEPTION == res.reply_type && AMQP_STATUS_TIMEOUT == res.library_error) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- zend_throw_exception(amqp_queue_exception_class_entry, "Consumer timeout exceed", 0 TSRMLS_CC);
	-
	- amqp_destroy_envelope(&envelope);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- if (AMQP_RESPONSE_NORMAL != res.reply_type) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	-
	- amqp_destroy_envelope(&envelope);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- MAKE_STD_ZVAL(message);
	- convert_amqp_envelope_to_zval(&envelope, message TSRMLS_CC);
	-
	- amqp_destroy_envelope(&envelope);
	-
	- /* Make the callback */
	- zval *params;
	- zval *retval_ptr = NULL;
	-
	- /* Build the parameter array */
	- MAKE_STD_ZVAL(params);
	- array_init(params);
	-
	- /* Dump it into the params array */
	- add_index_zval(params, 0, message);
	- Z_ADDREF_P(message);
	-
	- /* Add a pointer to the queue: */
	- add_index_zval(params, 1, id);
	- Z_ADDREF_P(id);
	-
	- /* Convert everything to be callable */
	- zend_fcall_info_args(&fci, params TSRMLS_CC);
	- /* Initialize the return value pointer */
	- fci.retval_ptr_ptr = &retval_ptr;
	-
	- /* Call the function, and track the return value */
	- if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && fci.retval_ptr_ptr && *fci.retval_ptr_ptr) {
	- COPY_PZVAL_TO_ZVAL(return_value, fci.retval_ptr_ptr);
	- }
	-
	- /* Clean up our mess */
	- zend_fcall_info_args_clear(&fci, 1);
	- zval_ptr_dtor(&params);
	- zval_ptr_dtor(&message);
	-
	- /* Check if user land function wants to bail */
	- if (EG(exception) \|\| (Z_TYPE_P(return_value) == IS_BOOL && !Z_BVAL_P(return_value))) {
	- break;
	- }
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	- return;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::ack(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	- acknowledge the message
	-*/
	-PHP_METHOD(amqp_queue_class, ack)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- long deliveryTag = 0;
	- long flags = AMQP_NOPARAM;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol\|l", &id, amqp_queue_class_entry, &deliveryTag, &flags ) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not ack message.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not ack message.");
	-
	- /* NOTE: basic.ack is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	- int status = amqp_basic_ack(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- deliveryTag,
	- (AMQP_MULTIPLE & flags) ? 1 : 0
	- );
	-
	- if (status != AMQP_STATUS_OK) {
	- /* Emulate library error */
	- amqp_rpc_reply_t res;
	- res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	- res.library_error = status;
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::nack(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	- acknowledge the message
	-*/
	-PHP_METHOD(amqp_queue_class, nack)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- long deliveryTag = 0;
	- long flags = AMQP_NOPARAM;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol\|l", &id, amqp_queue_class_entry, &deliveryTag, &flags ) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not nack message.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not nack message.");
	-
	- /* NOTE: basic.nack is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	- int status = amqp_basic_nack(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- deliveryTag,
	- (AMQP_MULTIPLE & flags) ? 1 : 0,
	- (AMQP_REQUEUE & flags) ? 1 : 0
	- );
	-
	- if (status != AMQP_STATUS_OK) {
	- /* Emulate library error */
	- amqp_rpc_reply_t res;
	- res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	- res.library_error = status;
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::reject(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	- acknowledge the message
	-*/
	-PHP_METHOD(amqp_queue_class, reject)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- long deliveryTag = 0;
	- long flags = AMQP_NOPARAM;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol\|l", &id, amqp_queue_class_entry, &deliveryTag, &flags ) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not reject message.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not reject message.");
	-
	- /* NOTE: basic.reject is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	- int status = amqp_basic_reject(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- deliveryTag,
	- (AMQP_REQUEUE & flags) ? 1 : 0
	- );
	-
	- if (status != AMQP_STATUS_OK) {
	- /* Emulate library error */
	- amqp_rpc_reply_t res;
	- res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	- res.library_error = status;
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::purge();
	-purge queue
	-*/
	-PHP_METHOD(amqp_queue_class, purge)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not purge queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not purge queue.");
	-
	- amqp_queue_purge_ok_t *r = amqp_queue_purge(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name)
	- );
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- /* long message_count = r->message_count; */
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- /* RETURN_LONG(message_count) */;
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::cancel([string consumer_tag]);
	-cancel queue to consumer
	-*/
	-PHP_METHOD(amqp_queue_class, cancel)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *consumer_tag = NULL;
	- int consumer_tag_len = 0;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|s", &id, amqp_queue_class_entry, &consumer_tag, &consumer_tag_len) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not cancel queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not cancel queue.");
	-
	- if (!consumer_tag_len && !queue->consumer_tag_len) {
	- return;
	- }
	-
	- amqp_basic_cancel_ok_t *r = amqp_basic_cancel(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- consumer_tag_len > 0 ? amqp_cstring_bytes(consumer_tag) : amqp_cstring_bytes(queue->consumer_tag)
	- );
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- if (!consumer_tag_len \|\| strcmp(consumer_tag, queue->consumer_tag) != 0) {
	- memset(queue->consumer_tag, 0, sizeof(queue->consumer_tag));
	- queue->consumer_tag_len = 0;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::unbind(string exchangeName, [string routingKey, array arguments]);
	-unbind queue from exchange
	-*/
	-PHP_METHOD(amqp_queue_class, unbind)
	-{
	- zval id, zvalArguments = NULL;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- char *exchange_name;
	- int exchange_name_len;
	- char *keyname = NULL;
	- int keyname_len = 0;
	-
	- amqp_table_t *arguments;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os\|sa", &id, amqp_queue_class_entry, &exchange_name, &exchange_name_len, &keyname, &keyname_len, &zvalArguments) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not unbind queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not unbind queue.");
	-
	- if (zvalArguments) {
	- arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	- }
	-
	- amqp_queue_unbind(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- (exchange_name_len > 0 ? amqp_cstring_bytes(exchange_name) : amqp_empty_bytes),
	- (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	- (zvalArguments ? *arguments : amqp_empty_table)
	- );
	-
	- if (zvalArguments) {
	- php_amqp_free_amqp_table(arguments);
	- }
	-
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_TRUE;
	-}
	-/* }}} */
	-
	-
	-/* {{{ proto int AMQPQueue::delete([long flags = AMQP_NOPARAM]]);
	-delete queue and return the number of messages deleted in it
	-*/
	-PHP_METHOD(amqp_queue_class, delete)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	- amqp_connection_object *connection;
	-
	- long flags = AMQP_NOPARAM;
	-
	- long message_count;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|l", &id, amqp_queue_class_entry, &flags) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- channel = AMQP_GET_CHANNEL(queue);
	- AMQP_VERIFY_CHANNEL(channel, "Could not delete queue.");
	-
	- connection = AMQP_GET_CONNECTION(channel);
	- AMQP_VERIFY_CONNECTION(connection, "Could not delete queue.");
	-
	- amqp_queue_delete_ok_t * r = amqp_queue_delete(
	- connection->connection_resource->connection_state,
	- channel->channel_id,
	- amqp_cstring_bytes(queue->name),
	- (AMQP_IFUNUSED & flags) ? 1 : 0,
	- (AMQP_IFEMPTY & flags) ? 1 : 0
	- );
	-
	- if (!r) {
	- amqp_rpc_reply_t res = amqp_get_rpc_reply(connection->connection_resource->connection_state);
	-
	- PHP_AMQP_INIT_ERROR_MESSAGE();
	-
	- php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection, channel TSRMLS_CC);
	-
	- php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- PHP_AMQP_DESTROY_ERROR_MESSAGE();
	- return;
	- }
	-
	- message_count = r->message_count;
	-
	- php_amqp_maybe_release_buffers_on_channel(connection, channel);
	-
	- RETURN_LONG(message_count);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPChannel::getChannel()
	-Get the AMQPChannel object in use */
	-PHP_METHOD(amqp_queue_class, getChannel)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|l", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	-
	- RETURN_ZVAL(queue->channel, 1, 0);
	-}
	-/* }}} */
	-
	-/* {{{ proto AMQPChannel::getConnection()
	-Get the AMQPConnection object in use */
	-PHP_METHOD(amqp_queue_class, getConnection)
	-{
	- zval *id;
	- amqp_queue_object *queue;
	- amqp_channel_object *channel;
	-
	- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O\|l", &id, amqp_queue_class_entry) == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(id TSRMLS_CC);
	- channel = AMQP_GET_CHANNEL(queue);
	-
	- RETURN_ZVAL(channel->connection, 1, 0);
	-}
	-/* }}} */
	-
	-/* {{{ proto string AMQPChannel::getConsumerTag()
	-Get latest consumer tag*/
	-PHP_METHOD(amqp_queue_class, getConsumerTag)
	-{
	- amqp_queue_object *queue;
	-
	- if (zend_parse_parameters_none() == FAILURE) {
	- return;
	- }
	-
	- queue = (amqp_queue_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
	-
	- if (queue->consumer_tag_len > 0) {
	- RETURN_STRINGL(queue->consumer_tag, strlen(queue->consumer_tag), 1);
	- }
	-
	- RETURN_NULL();
	-}
	-/* }}} */
	-
	-
	-/*
	-*Local variables:
	-*tab-width: 4
	-*tabstop: 4
	-*c-basic-offset: 4
	-*End:
	-*vim600: noet sw=4 ts=4 fdm=marker
	-*vim<600: noet sw=4 ts=4
	-*/
	diff --git a/amqp-1.6.1/tests/amqpchannel_var_dump.phpt b/amqp-1.6.1/tests/amqpchannel_var_dump.phpt
	deleted file mode 100644
	index 816db43..0000000
	--- a/amqp-1.6.1/tests/amqpchannel_var_dump.phpt
	+++ /dev/null
	@@ -1,40 +0,0 @@
	---TEST--
	-AMQPChannel var_dump
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	-?>
	---FILE--
	-<?php
	-$cnn = new AMQPConnection();
	-$cnn->connect();
	-$ch = new AMQPChannel($cnn);
	-
	-var_dump($ch);
	-$cnn->disconnect();
	-var_dump($ch);
	-
	-?>
	---EXPECT--
	-object(AMQPChannel)#2 (4) {
	- ["channel_id"]=>
	- int(1)
	- ["prefetch_count"]=>
	- int(3)
	- ["prefetch_size"]=>
	- int(0)
	- ["is_connected"]=>
	- bool(true)
	-}
	-object(AMQPChannel)#2 (4) {
	- ["channel_id"]=>
	- int(1)
	- ["prefetch_count"]=>
	- int(3)
	- ["prefetch_size"]=>
	- int(0)
	- ["is_connected"]=>
	- bool(false)
	-}
	diff --git a/amqp-1.6.1/tests/amqpconnection_persistent_var_dump.phpt b/amqp-1.6.1/tests/amqpconnection_persistent_var_dump.phpt
	deleted file mode 100644
	index c4c22cf..0000000
	--- a/amqp-1.6.1/tests/amqpconnection_persistent_var_dump.phpt
	+++ /dev/null
	@@ -1,148 +0,0 @@
	---TEST--
	-AMQPConnection: persistent connection var_dump
	---SKIPIF--
	-<?php if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<') ) print "skip"; ?>
	---FILE--
	-<?php
	-
	-$cnn = new AMQPConnection();
	-var_dump($cnn);
	-$cnn->pconnect();
	-var_dump($cnn);
	-
	-$ch = new AMQPChannel($cnn);
	-var_dump($cnn);
	-
	-$cnn->pdisconnect();
	-var_dump($cnn);
	-
	-?>
	---EXPECT--
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(false)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- NULL
	- ["used_channels"]=>
	- NULL
	- ["max_channel_id"]=>
	- NULL
	- ["max_frame_size"]=>
	- NULL
	- ["heartbeat_interval"]=>
	- NULL
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(true)
	- ["is_persistent"]=>
	- bool(true)
	- ["connection_resource"]=>
	- resource(4) of type (AMQP Connection Resource)
	- ["used_channels"]=>
	- int(0)
	- ["max_channel_id"]=>
	- int(256)
	- ["max_frame_size"]=>
	- int(131072)
	- ["heartbeat_interval"]=>
	- int(0)
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(true)
	- ["is_persistent"]=>
	- bool(true)
	- ["connection_resource"]=>
	- resource(4) of type (AMQP Connection Resource)
	- ["used_channels"]=>
	- int(1)
	- ["max_channel_id"]=>
	- int(256)
	- ["max_frame_size"]=>
	- int(131072)
	- ["heartbeat_interval"]=>
	- int(0)
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(false)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- NULL
	- ["used_channels"]=>
	- NULL
	- ["max_channel_id"]=>
	- NULL
	- ["max_frame_size"]=>
	- NULL
	- ["heartbeat_interval"]=>
	- NULL
	-}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpconnection_var_dump.phpt b/amqp-1.6.1/tests/amqpconnection_var_dump.phpt
	deleted file mode 100644
	index 39c53c4..0000000
	--- a/amqp-1.6.1/tests/amqpconnection_var_dump.phpt
	+++ /dev/null
	@@ -1,152 +0,0 @@
	---TEST--
	-AMQPConnection var_dump
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	-?>
	---FILE--
	-<?php
	-$cnn = new AMQPConnection();
	-var_dump($cnn);
	-$cnn->connect();
	-$cnn->connect();
	-var_dump($cnn);
	-
	-$c = new AMQPChannel($cnn);
	-
	-var_dump($cnn);
	-
	-$cnn->disconnect();
	-var_dump($cnn);
	-?>
	---EXPECT--
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(false)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- NULL
	- ["used_channels"]=>
	- NULL
	- ["max_channel_id"]=>
	- NULL
	- ["max_frame_size"]=>
	- NULL
	- ["heartbeat_interval"]=>
	- NULL
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(true)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- resource(4) of type (AMQP Connection Resource)
	- ["used_channels"]=>
	- int(0)
	- ["max_channel_id"]=>
	- int(256)
	- ["max_frame_size"]=>
	- int(131072)
	- ["heartbeat_interval"]=>
	- int(0)
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(true)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- resource(4) of type (AMQP Connection Resource)
	- ["used_channels"]=>
	- int(1)
	- ["max_channel_id"]=>
	- int(256)
	- ["max_frame_size"]=>
	- int(131072)
	- ["heartbeat_interval"]=>
	- int(0)
	-}
	-object(AMQPConnection)#1 (15) {
	- ["login"]=>
	- string(5) "guest"
	- ["password"]=>
	- string(5) "guest"
	- ["host"]=>
	- string(9) "localhost"
	- ["vhost"]=>
	- string(1) "/"
	- ["port"]=>
	- int(5672)
	- ["read_timeout"]=>
	- float(0)
	- ["write_timeout"]=>
	- float(0)
	- ["connect_timeout"]=>
	- float(0)
	- ["is_connected"]=>
	- bool(false)
	- ["is_persistent"]=>
	- bool(false)
	- ["connection_resource"]=>
	- NULL
	- ["used_channels"]=>
	- NULL
	- ["max_channel_id"]=>
	- NULL
	- ["max_frame_size"]=>
	- NULL
	- ["heartbeat_interval"]=>
	- NULL
	-}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpenvelope_var_dump.phpt b/amqp-1.6.1/tests/amqpenvelope_var_dump.phpt
	deleted file mode 100644
	index 18e53d4..0000000
	--- a/amqp-1.6.1/tests/amqpenvelope_var_dump.phpt
	+++ /dev/null
	@@ -1,114 +0,0 @@
	---TEST--
	-AMQPEnvelope var_dump
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	---FILE--
	-<?php
	-require '_test_helpers.php';
	-
	-$cnn = new AMQPConnection();
	-$cnn->connect();
	-$ch = new AMQPChannel($cnn);
	-// Declare a new exchange
	-$ex = new AMQPExchange($ch);
	-$ex->setName('exchange1');
	-$ex->setType(AMQP_EX_TYPE_FANOUT);
	-$ex->declareExchange();
	-// Create a new queue
	-$q = new AMQPQueue($ch);
	-$q->setName('queue1' . microtime(true));
	-$q->declareQueue();
	-// Bind it on the exchange to routing.key
	-$q->bind($ex->getName(), 'routing.*');
	-// Publish a message to the exchange with a routing key
	-$ex->publish('message', 'routing.1');
	-$ex->publish('message', 'routing.1', AMQP_NOPARAM, array("headers" => array("test" => "passed")));
	-
	-// Read from the queue
	-$q->consume("consumeThings");
	-$q->consume("consumeThings");
	-?>
	---EXPECT--
	-object(AMQPEnvelope)#5 (18) {
	- ["body"]=>
	- string(7) "message"
	- ["content_type"]=>
	- string(10) "text/plain"
	- ["routing_key"]=>
	- string(9) "routing.1"
	- ["delivery_tag"]=>
	- int(1)
	- ["delivery_mode"]=>
	- int(1)
	- ["exchange_name"]=>
	- string(9) "exchange1"
	- ["is_redelivery"]=>
	- int(0)
	- ["content_encoding"]=>
	- string(0) ""
	- ["type"]=>
	- string(0) ""
	- ["timestamp"]=>
	- int(0)
	- ["priority"]=>
	- int(0)
	- ["expiration"]=>
	- string(0) ""
	- ["user_id"]=>
	- string(0) ""
	- ["app_id"]=>
	- string(0) ""
	- ["message_id"]=>
	- string(0) ""
	- ["reply_to"]=>
	- string(0) ""
	- ["correlation_id"]=>
	- string(0) ""
	- ["headers"]=>
	- array(0) {
	- }
	-}
	-object(AMQPEnvelope)#5 (18) {
	- ["body"]=>
	- string(7) "message"
	- ["content_type"]=>
	- string(10) "text/plain"
	- ["routing_key"]=>
	- string(9) "routing.1"
	- ["delivery_tag"]=>
	- int(2)
	- ["delivery_mode"]=>
	- int(1)
	- ["exchange_name"]=>
	- string(9) "exchange1"
	- ["is_redelivery"]=>
	- int(0)
	- ["content_encoding"]=>
	- string(0) ""
	- ["type"]=>
	- string(0) ""
	- ["timestamp"]=>
	- int(0)
	- ["priority"]=>
	- int(0)
	- ["expiration"]=>
	- string(0) ""
	- ["user_id"]=>
	- string(0) ""
	- ["app_id"]=>
	- string(0) ""
	- ["message_id"]=>
	- string(0) ""
	- ["reply_to"]=>
	- string(0) ""
	- ["correlation_id"]=>
	- string(0) ""
	- ["headers"]=>
	- array(1) {
	- ["test"]=>
	- string(6) "passed"
	- }
	-}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpexchange_set_flags.phpt b/amqp-1.6.1/tests/amqpexchange_set_flags.phpt
	deleted file mode 100644
	index 4e16c58..0000000
	--- a/amqp-1.6.1/tests/amqpexchange_set_flags.phpt
	+++ /dev/null
	@@ -1,41 +0,0 @@
	---TEST--
	-AMQPExchange setFlags()
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	---FILE--
	-<?php
	-$cnn = new AMQPConnection();
	-$cnn->connect();
	-$ch = new AMQPChannel($cnn);
	-// Declare a new exchange
	-$ex = new AMQPExchange($ch);
	-$ex->setName('exchange-' . microtime(true));
	-$ex->setType(AMQP_EX_TYPE_FANOUT);
	-$ex->setArguments(array("x-ha-policy" => "all"));
	-$ex->setFlags(AMQP_PASSIVE \| AMQP_DURABLE \| AMQP_AUTODELETE \| AMQP_INTERNAL);
	-
	-var_dump($ex);
	-?>
	---EXPECTF--
	-object(AMQPExchange)#3 (7) {
	- ["name"]=>
	- string(%d) "exchange-%f"
	- ["type"]=>
	- string(6) "fanout"
	- ["passive"]=>
	- bool(true)
	- ["durable"]=>
	- bool(true)
	- ["auto_delete"]=>
	- bool(true)
	- ["internal"]=>
	- bool(true)
	- ["arguments"]=>
	- array(1) {
	- ["x-ha-policy"]=>
	- string(3) "all"
	- }
	-}
	diff --git a/amqp-1.6.1/tests/amqpexchange_var_dump.phpt b/amqp-1.6.1/tests/amqpexchange_var_dump.phpt
	deleted file mode 100644
	index a278b84..0000000
	--- a/amqp-1.6.1/tests/amqpexchange_var_dump.phpt
	+++ /dev/null
	@@ -1,57 +0,0 @@
	---TEST--
	-AMQPExchange var_dump
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	---FILE--
	-<?php
	-$cnn = new AMQPConnection();
	-$cnn->connect();
	-$ch = new AMQPChannel($cnn);
	-// Declare a new exchange
	-$ex = new AMQPExchange($ch);
	-$ex->setName('exchange-' . microtime(true));
	-$ex->setType(AMQP_EX_TYPE_FANOUT);
	-var_dump($ex);
	-$ex->setArguments(array("x-ha-policy" => "all"));
	-var_dump($ex);
	-?>
	---EXPECTF--
	-object(AMQPExchange)#3 (7) {
	- ["name"]=>
	- string(%d) "exchange-%f"
	- ["type"]=>
	- string(6) "fanout"
	- ["passive"]=>
	- bool(false)
	- ["durable"]=>
	- bool(false)
	- ["auto_delete"]=>
	- bool(false)
	- ["internal"]=>
	- bool(false)
	- ["arguments"]=>
	- array(0) {
	- }
	-}
	-object(AMQPExchange)#3 (7) {
	- ["name"]=>
	- string(%d) "exchange-%f"
	- ["type"]=>
	- string(6) "fanout"
	- ["passive"]=>
	- bool(false)
	- ["durable"]=>
	- bool(false)
	- ["auto_delete"]=>
	- bool(false)
	- ["internal"]=>
	- bool(false)
	- ["arguments"]=>
	- array(1) {
	- ["x-ha-policy"]=>
	- string(3) "all"
	- }
	-}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpqueue_var_dump.phpt b/amqp-1.6.1/tests/amqpqueue_var_dump.phpt
	deleted file mode 100644
	index 85c1105..0000000
	--- a/amqp-1.6.1/tests/amqpqueue_var_dump.phpt
	+++ /dev/null
	@@ -1,41 +0,0 @@
	---TEST--
	-AMQPQueue var_dump
	---SKIPIF--
	-<?php
	-if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	- print "skip";
	-}
	---FILE--
	-<?php
	-$cnn = new AMQPConnection();
	-$cnn->connect();
	-$ch = new AMQPChannel($cnn);
	-// Declare a new exchange
	-$ex = new AMQPExchange($ch);
	-$ex->setName('exchange1');
	-$ex->setType(AMQP_EX_TYPE_FANOUT);
	-$ex->declareExchange();
	-// Create a new queue
	-$q = new AMQPQueue($ch);
	-$q->setName('queue_var_dump');
	-$q->declareQueue();
	-var_dump($q);
	-?>
	---EXPECT--
	-object(AMQPQueue)#4 (7) {
	- ["queue_name"]=>
	- string(14) "queue_var_dump"
	- ["consumer_tag"]=>
	- NULL
	- ["passive"]=>
	- bool(false)
	- ["durable"]=>
	- bool(false)
	- ["exclusive"]=>
	- bool(false)
	- ["auto_delete"]=>
	- bool(true)
	- ["arguments"]=>
	- array(0) {
	- }
	-}
	diff --git a/amqp-1.6.1/tests/bug_61533.phpt b/amqp-1.6.1/tests/bug_61533.phpt
	deleted file mode 100644
	index 34e0b31..0000000
	--- a/amqp-1.6.1/tests/bug_61533.phpt
	+++ /dev/null
	@@ -1,19 +0,0 @@
	---TEST--
	-Constructing AMQPQueue with AMQPConnection segfaults
	---SKIPIF--
	-<?php if (!extension_loaded("amqp")) print "skip"; ?>
	---FILE--
	-<?php
	-$conn = new AMQPConnection();
	-$conn->connect();
	-$chan = new AMQPChannel($conn);
	-try {
	- error_reporting(error_reporting() & ~E_WARNING);
	- $queue = new AMQPQueue($conn);
	-} catch (AMQPQueueException $e) {
	- echo $e->getMessage();
	-}
	-
	-?>
	---EXPECTF--
	-Parameter must be an instance of AMQPChannel.
	diff --git a/amqp-1.6.1/CREDITS b/amqp-1.7.0alpha1/CREDITS
	similarity index 100%
	rename from amqp-1.6.1/CREDITS
	rename to amqp-1.7.0alpha1/CREDITS
	diff --git a/amqp-1.6.1/LICENSE b/amqp-1.7.0alpha1/LICENSE
	similarity index 100%
	rename from amqp-1.6.1/LICENSE
	rename to amqp-1.7.0alpha1/LICENSE
	diff --git a/amqp-1.7.0alpha1/amqp.c b/amqp-1.7.0alpha1/amqp.c
	new file mode 100644
	index 0000000..41546b5
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp.c
	@@ -0,0 +1,500 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+/* $Id: amqp.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_ini.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+# include <stdint.h>
	+# include <signal.h>
	+#endif
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+
	+#include "php_amqp.h"
	+#include "amqp_connection.h"
	+#include "amqp_channel.h"
	+#include "amqp_queue.h"
	+#include "amqp_exchange.h"
	+#include "amqp_envelope.h"
	+#include "amqp_connection_resource.h"
	+
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+# include <unistd.h>
	+#endif
	+
	+#include "amqp_connection.h"
	+#include "amqp_connection_resource.h"
	+#include "amqp_channel.h"
	+#include "amqp_envelope.h"
	+#include "amqp_exchange.h"
	+#include "amqp_queue.h"
	+
	+/* True global resources - no need for thread safety here */
	+
	+zend_class_entry *amqp_exception_class_entry,
	+ *amqp_connection_exception_class_entry,
	+ *amqp_channel_exception_class_entry,
	+ *amqp_queue_exception_class_entry,
	+ *amqp_exchange_exception_class_entry;
	+
	+/* {{{ amqp_functions[]
	+*
	+*Every user visible function must have an entry in amqp_functions[].
	+*/
	+zend_function_entry amqp_functions[] = {
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+/* }}} */
	+
	+/* {{{ amqp_module_entry
	+*/
	+zend_module_entry amqp_module_entry = {
	+ STANDARD_MODULE_HEADER,
	+ "amqp",
	+ amqp_functions,
	+ PHP_MINIT(amqp),
	+ PHP_MSHUTDOWN(amqp),
	+ NULL,
	+ NULL,
	+ PHP_MINFO(amqp),
	+ PHP_AMQP_VERSION,
	+ STANDARD_MODULE_PROPERTIES
	+};
	+/* }}} */
	+
	+#ifdef COMPILE_DL_AMQP
	+ ZEND_GET_MODULE(amqp)
	+#endif
	+
	+void php_amqp_error(amqp_rpc_reply_t reply, char *message, amqp_connection_resource connection_resource, amqp_channel_resource *channel_resource TSRMLS_DC)
	+{
	+ assert(connection_resource != NULL);
	+
	+ switch (php_amqp_connection_resource_error(reply, message, connection_resource, (amqp_channel_t)(channel_resource ? channel_resource->channel_id : 0) TSRMLS_CC)) {
	+ case PHP_AMQP_RESOURCE_RESPONSE_OK:
	+ break;
	+ case PHP_AMQP_RESOURCE_RESPONSE_ERROR:
	+ /* Library or other non-protocol or even protocol related errors may be here, do nothing with this for now. */
	+ break;
	+ case PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED:
	+ /* Mark channel as closed to prevent sending channel.close request */
	+ assert(channel_resource != NULL);
	+ if (channel_resource) {
	+ channel_resource->is_connected = '\0';
	+
	+ /* Close channel */
	+ php_amqp_close_channel(channel_resource TSRMLS_CC);
	+ }
	+ /* No more error handling necessary, returning. */
	+ break;
	+ case PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED:
	+ /* Mark connection as closed to prevent sending any further requests */
	+ connection_resource->is_connected = '\0';
	+
	+ /* Close connection with all its channels */
	+ php_amqp_prepare_for_disconnect(connection_resource TSRMLS_CC);
	+ connection_resource->is_dirty = '\1';
	+
	+ /* No more error handling necessary, returning. */
	+ break;
	+ default:
	+ spprintf(message, 0, "Unknown server error, method id 0x%08X (not handled by extension)", reply.reply.id);
	+ break;
	+ }
	+}
	+
	+void php_amqp_zend_throw_exception(amqp_rpc_reply_t reply, zend_class_entry exception_ce, const char message, PHP5to7_param_long_type_t code TSRMLS_DC)
	+{
	+ switch (reply.reply_type) {
	+ case AMQP_RESPONSE_NORMAL:
	+ break;
	+ case AMQP_RESPONSE_NONE:
	+ exception_ce = amqp_exception_class_entry;
	+ break;
	+ case AMQP_RESPONSE_LIBRARY_EXCEPTION:
	+ exception_ce = amqp_exception_class_entry;
	+ break;
	+ case AMQP_RESPONSE_SERVER_EXCEPTION:
	+ switch (reply.reply.id) {
	+ case AMQP_CONNECTION_CLOSE_METHOD:
	+ /* Fatal errors - pass them to connection level */
	+ exception_ce = amqp_connection_exception_class_entry;
	+ break;
	+ case AMQP_CHANNEL_CLOSE_METHOD:
	+ /* Most channel-level errors occurs due to previously known action and thus their kind can be predicted. */
	+ /* exception_ce = amqp_channel_exception_class_entry; */
	+ break;
	+ }
	+ break;
	+ /* Default for the above switch should be handled by the below default. */
	+ default:
	+ exception_ce = amqp_exception_class_entry;
	+ break;
	+ }
	+
	+ zend_throw_exception(exception_ce, message, code TSRMLS_CC);
	+}
	+
	+
	+void php_amqp_maybe_release_buffers_on_channel(amqp_connection_resource connection_resource, amqp_channel_resource channel_resource)
	+{
	+ assert(channel_resource != NULL);
	+ assert(channel_resource->channel_id > 0);
	+
	+ if (connection_resource) {
	+ amqp_maybe_release_buffers_on_channel(connection_resource->connection_state, channel_resource->channel_id);
	+ }
	+}
	+
	+amqp_bytes_t php_amqp_long_string(char const *cstr, PHP5to7_param_str_len_type_t len)
	+{
	+ if (len < 1) {
	+ return amqp_empty_bytes;
	+ }
	+
	+ amqp_bytes_t result;
	+ result.len = (size_t)len;
	+ result.bytes = (void *) cstr;
	+
	+ return result;
	+}
	+
	+char *stringify_bytes(amqp_bytes_t bytes)
	+{
	+/* We will need up to 4 chars per byte, plus the terminating 0 */
	+ char res = emalloc(bytes.len 4 + 1);
	+ uint8_t *data = bytes.bytes;
	+ char *p = res;
	+ size_t i;
	+
	+ for (i = 0; i < bytes.len; i++) {
	+ if (data[i] >= 32 && data[i] != 127) {
	+ *p++ = data[i];
	+ } else {
	+ *p++ = '\\';
	+ *p++ = '0' + (data[i] >> 6);
	+ *p++ = '0' + (data[i] >> 3 & 0x7);
	+ *p++ = '0' + (data[i] & 0x7);
	+ }
	+ }
	+
	+ *p = 0;
	+ return res;
	+}
	+
	+void internal_convert_zval_to_amqp_table(zval zvalArguments, amqp_table_t arguments, char allow_int_keys TSRMLS_DC)
	+{
	+ HashTable *ht;
	+ HashPosition pos;
	+
	+ zval *value;
	+ zval **data;
	+
	+ PHP5to7_ZEND_REAL_HASH_KEY_T *real_key;
	+
	+ char *key;
	+ uint key_len;
	+
	+ ulong index;
	+
	+ char type[16];
	+ amqp_table_t *inner_table;
	+
	+ ht = Z_ARRVAL_P(zvalArguments);
	+
	+ /* Allocate all the memory necessary for storing the arguments */
	+ arguments->entries = (amqp_table_entry_t *)ecalloc((size_t)zend_hash_num_elements(ht), sizeof(amqp_table_entry_t));
	+ arguments->num_entries = 0;
	+
	+ PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, index, real_key, key, key_len, data, value, pos) {
	+ char *strKey;
	+ char *strValue;
	+ amqp_table_entry_t *table;
	+ amqp_field_value_t *field;
	+
	+
	+ /* Now pull the key */
	+
	+ if (!PHP5to7_ZEND_HASH_KEY_IS_STRING(ht, real_key, key, key_len, index, pos)) {
	+ if (allow_int_keys) {
	+ /* Convert to strings non-string keys */
	+ char str[32];
	+
	+ key_len = sprintf(str, "%lu", index);
	+ key = str;
	+ } else {
	+ /* Skip things that are not strings */
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ignoring non-string header field '%lu'", index);
	+
	+
	+
	+ PHP5to7_ZEND_HASH_FOREACH_CONTINUE;
	+ }
	+ } else {
	+ PHP5to7_ZEND_HASH_KEY_MAYBE_UNPACK(real_key, key, key_len);
	+ }
	+
	+ /* Build the value */
	+ table = &arguments->entries[arguments->num_entries++];
	+ field = &table->value;
	+
	+ switch (Z_TYPE_P(value)) {
	+ PHP5to7_CASE_IS_BOOL:
	+ field->kind = AMQP_FIELD_KIND_BOOLEAN;
	+ field->value.boolean = (amqp_boolean_t)Z_LVAL_P(value);
	+ break;
	+ case IS_DOUBLE:
	+ field->kind = AMQP_FIELD_KIND_F64;
	+ field->value.f64 = Z_DVAL_P(value);
	+ break;
	+ case IS_LONG:
	+ field->kind = AMQP_FIELD_KIND_I64;
	+ field->value.i64 = Z_LVAL_P(value);
	+ break;
	+ case IS_STRING:
	+ field->kind = AMQP_FIELD_KIND_UTF8;
	+
	+ if (Z_STRLEN_P(value)) {
	+ amqp_bytes_t bytes;
	+ bytes.len = (size_t) Z_STRLEN_P(value);
	+ bytes.bytes = estrndup(Z_STRVAL_P(value), (uint)Z_STRLEN_P(value));
	+
	+ field->value.bytes = bytes;
	+ } else {
	+ field->value.bytes = amqp_empty_bytes;
	+ }
	+
	+ break;
	+ case IS_ARRAY:
	+ field->kind = AMQP_FIELD_KIND_TABLE;
	+ internal_convert_zval_to_amqp_table(value, &field->value.table, 1 TSRMLS_CC);
	+
	+ break;
	+ default:
	+ switch(Z_TYPE_P(value)) {
	+ case IS_NULL: strcpy(type, "null"); break;
	+ case IS_OBJECT: strcpy(type, "object"); break;
	+ case IS_RESOURCE: strcpy(type, "resource"); break;
	+ default: strcpy(type, "unknown");
	+ }
	+
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ignoring field '%s' due to unsupported value type (%s)", key, type);
	+
	+ /* Reset entries counter back */
	+ arguments->num_entries --;
	+
	+ PHP5to7_ZEND_HASH_FOREACH_CONTINUE;
	+ }
	+
	+ strKey = estrndup(key, key_len);
	+ table->key = amqp_cstring_bytes(strKey);
	+
	+ } PHP5to7_ZEND_HASH_FOREACH_END();
	+};
	+
	+inline amqp_table_t convert_zval_to_amqp_table(zval zvalArguments TSRMLS_DC)
	+{
	+ amqp_table_t *arguments;
	+ /* In setArguments, we are overwriting all the existing values */
	+ arguments = (amqp_table_t *)emalloc(sizeof(amqp_table_t));
	+
	+ internal_convert_zval_to_amqp_table(zvalArguments, arguments, 0 TSRMLS_CC);
	+
	+ return arguments;
	+}
	+
	+
	+
	+
	+void internal_php_amqp_free_amqp_table(amqp_table_t *object, char clear_root)
	+{
	+ if (!object) {
	+ return;
	+ }
	+
	+ if (object->entries) {
	+ int macroEntryCounter;
	+ for (macroEntryCounter = 0; macroEntryCounter < object->num_entries; macroEntryCounter++) {
	+
	+ amqp_table_entry_t *entry = &object->entries[macroEntryCounter];
	+ efree(entry->key.bytes);
	+
	+ switch (entry->value.kind) {
	+ case AMQP_FIELD_KIND_TABLE:
	+ internal_php_amqp_free_amqp_table(&entry->value.value.table, 0);
	+ break;
	+ case AMQP_FIELD_KIND_UTF8:
	+ if (entry->value.value.bytes.bytes) {
	+ efree(entry->value.value.bytes.bytes);
	+ }
	+ break;
	+ default:
	+ break;
	+ }
	+ }
	+ efree(object->entries);
	+ }
	+
	+ if (clear_root) {
	+ efree(object);
	+ }
	+}
	+
	+void php_amqp_free_amqp_table(amqp_table_t *object)
	+{
	+ internal_php_amqp_free_amqp_table(object, 1);
	+}
	+
	+
	+PHP_INI_BEGIN()
	+ PHP_INI_ENTRY("amqp.host", DEFAULT_HOST, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.vhost", DEFAULT_VHOST, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.port", DEFAULT_PORT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.timeout", DEFAULT_TIMEOUT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.read_timeout", DEFAULT_READ_TIMEOUT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.write_timeout", DEFAULT_WRITE_TIMEOUT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.connect_timeout", DEFAULT_CONNECT_TIMEOUT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.login", DEFAULT_LOGIN, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.password", DEFAULT_PASSWORD, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.auto_ack", DEFAULT_AUTOACK, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.prefetch_count", DEFAULT_PREFETCH_COUNT, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.channel_max", DEFAULT_CHANNEL_MAX, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.frame_max", DEFAULT_FRAME_MAX, PHP_INI_ALL, NULL)
	+ PHP_INI_ENTRY("amqp.heartbeat", DEFAULT_HEARTBEAT, PHP_INI_ALL, NULL)
	+PHP_INI_END()
	+
	+/* {{{ PHP_MINIT_FUNCTION
	+*/
	+PHP_MINIT_FUNCTION(amqp)
	+{
	+ zend_class_entry ce;
	+
	+ /* Set up the connection resource */
	+ le_amqp_connection_resource = zend_register_list_destructors_ex(amqp_connection_resource_dtor, NULL, PHP_AMQP_CONNECTION_RES_NAME, module_number);
	+ le_amqp_connection_resource_persistent = zend_register_list_destructors_ex(NULL, amqp_connection_resource_dtor_persistent, PHP_AMQP_CONNECTION_RES_NAME, module_number);
	+
	+ PHP_MINIT(amqp_connection)(INIT_FUNC_ARGS_PASSTHRU);
	+ PHP_MINIT(amqp_channel)(INIT_FUNC_ARGS_PASSTHRU);
	+ PHP_MINIT(amqp_queue)(INIT_FUNC_ARGS_PASSTHRU);
	+ PHP_MINIT(amqp_exchange)(INIT_FUNC_ARGS_PASSTHRU);
	+ PHP_MINIT(amqp_envelope)(INIT_FUNC_ARGS_PASSTHRU);
	+
	+ /* Class Exceptions */
	+ INIT_CLASS_ENTRY(ce, "AMQPException", NULL);
	+ amqp_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C));
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPConnectionException", NULL);
	+ amqp_connection_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPChannelException", NULL);
	+ amqp_channel_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPQueueException", NULL);
	+ amqp_queue_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPExchangeException", NULL);
	+ amqp_exchange_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
	+
	+ REGISTER_INI_ENTRIES();
	+
	+ REGISTER_LONG_CONSTANT("AMQP_NOPARAM", AMQP_NOPARAM, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_JUST_CONSUME", AMQP_JUST_CONSUME, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_DURABLE", AMQP_DURABLE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_PASSIVE", AMQP_PASSIVE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_EXCLUSIVE", AMQP_EXCLUSIVE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_AUTODELETE", AMQP_AUTODELETE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_INTERNAL", AMQP_INTERNAL, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_NOLOCAL", AMQP_NOLOCAL, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_AUTOACK", AMQP_AUTOACK, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_IFEMPTY", AMQP_IFEMPTY, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_IFUNUSED", AMQP_IFUNUSED, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_MANDATORY", AMQP_MANDATORY, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_IMMEDIATE", AMQP_IMMEDIATE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_MULTIPLE", AMQP_MULTIPLE, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_NOWAIT", AMQP_NOWAIT, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("AMQP_REQUEUE", AMQP_REQUEUE, CONST_CS \| CONST_PERSISTENT);
	+
	+ REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_DIRECT", AMQP_EX_TYPE_DIRECT, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_FANOUT", AMQP_EX_TYPE_FANOUT, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_TOPIC", AMQP_EX_TYPE_TOPIC, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_STRING_CONSTANT("AMQP_EX_TYPE_HEADERS",AMQP_EX_TYPE_HEADERS, CONST_CS \| CONST_PERSISTENT);
	+
	+ REGISTER_LONG_CONSTANT("AMQP_OS_SOCKET_TIMEOUT_ERRNO", AMQP_OS_SOCKET_TIMEOUT_ERRNO, CONST_CS \| CONST_PERSISTENT);
	+ REGISTER_LONG_CONSTANT("PHP_AMQP_MAX_CHANNELS", PHP_AMQP_MAX_CHANNELS, CONST_CS \| CONST_PERSISTENT);
	+
	+ return SUCCESS;
	+}
	+/* }}} */
	+
	+/* {{{ PHP_MSHUTDOWN_FUNCTION
	+*/
	+PHP_MSHUTDOWN_FUNCTION(amqp)
	+{
	+ UNREGISTER_INI_ENTRIES();
	+
	+ return SUCCESS;
	+}
	+/* }}} */
	+
	+
	+/* {{{ PHP_MINFO_FUNCTION
	+*/
	+PHP_MINFO_FUNCTION(amqp)
	+{
	+ php_info_print_table_start();
	+ php_info_print_table_header(2, "Version", PHP_AMQP_VERSION);
	+ php_info_print_table_header(2, "Revision", PHP_AMQP_REVISION);
	+ php_info_print_table_header(2, "Compiled", __DATE__ " @ " __TIME__);
	+ php_info_print_table_header(2, "AMQP protocol version", "0-9-1");
	+ php_info_print_table_header(2, "librabbitmq version", amqp_version());
	+ php_info_print_table_header(2, "Default max channels per connection", DEFAULT_CHANNEL_MAX);
	+ php_info_print_table_header(2, "Default max frame size", DEFAULT_FRAME_MAX);
	+ php_info_print_table_header(2, "Default heartbeats interval", DEFAULT_HEARTBEAT);
	+ DISPLAY_INI_ENTRIES();
	+}
	+/* }}} */
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.7.0alpha1/amqp_channel.c b/amqp-1.7.0alpha1/amqp_channel.c
	new file mode 100644
	index 0000000..69d71e6
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp_channel.c
	@@ -0,0 +1,756 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+/* $Id: amqp_channel.c 318036 2011-10-11 20:30:46Z pdezwart $ */
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+# include <stdint.h>
	+# include <signal.h>
	+#endif
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+# include <unistd.h>
	+#endif
	+
	+#include "php_amqp.h"
	+#include "amqp_connection.h"
	+#include "amqp_connection_resource.h"
	+#include "amqp_channel.h"
	+
	+zend_class_entry *amqp_channel_class_entry;
	+#define this_ce amqp_channel_class_entry
	+
	+zend_object_handlers amqp_channel_object_handlers;
	+
	+void php_amqp_close_channel(amqp_channel_resource *channel_resource TSRMLS_DC)
	+{
	+ assert(channel_resource != NULL);
	+
	+ amqp_connection_resource *connection_resource = channel_resource->connection_resource;
	+
	+ if (connection_resource != NULL) {
	+ /* First, remove it from active channels table to prevent recursion in case of connection error */
	+ php_amqp_connection_resource_unregister_channel(connection_resource, channel_resource->channel_id);
	+ } else {
	+ channel_resource->is_connected = '\0';
	+ }
	+
	+ assert(channel_resource->connection_resource == NULL);
	+
	+ if (!channel_resource->is_connected) {
	+ /* Nothing to do more - channel was previously marked as closed, possibly, due to channel-level error */
	+ return;
	+ }
	+
	+ channel_resource->is_connected = '\0';
	+
	+ if (connection_resource && connection_resource->is_connected) {
	+ assert(connection_resource != NULL);
	+
	+ amqp_channel_close(connection_resource->connection_state, channel_resource->channel_id, AMQP_REPLY_SUCCESS);
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(connection_resource, channel_resource);
	+ }
	+}
	+
	+
	+void amqp_channel_free(PHP5to7_obj_free_zend_object *object TSRMLS_DC)
	+{
	+ amqp_channel_object *channel = PHP_AMQP_FETCH_CHANNEL(object);
	+
	+ if (channel->channel_resource != NULL) {
	+ php_amqp_close_channel(channel->channel_resource TSRMLS_CC);
	+
	+ efree(channel->channel_resource);
	+ channel->channel_resource = NULL;
	+ }
	+
	+ zend_object_std_dtor(&channel->zo TSRMLS_CC);
	+
	+#if PHP_MAJOR_VERSION < 7
	+ efree(object);
	+#endif
	+}
	+
	+
	+PHP5to7_zend_object_value amqp_channel_ctor(zend_class_entry *ce TSRMLS_DC)
	+{
	+ amqp_channel_object *channel = PHP5to7_ECALLOC_CHANNEL_OBJECT(ce);
	+
	+ zend_object_std_init(&channel->zo, ce TSRMLS_CC);
	+ AMQP_OBJECT_PROPERTIES_INIT(channel->zo, ce);
	+
	+#if PHP_MAJOR_VERSION >=7
	+ channel->zo.handlers = &amqp_channel_object_handlers;
	+
	+ return &channel->zo;
	+#else
	+ PHP5to7_zend_object_value new_value;
	+
	+ new_value.handle = zend_objects_store_put(
	+ channel,
	+ NULL,
	+ (zend_objects_free_object_storage_t) amqp_channel_free,
	+ NULL TSRMLS_CC
	+ );
	+
	+ new_value.handlers = zend_get_std_object_handlers();
	+
	+ return new_value;
	+#endif
	+}
	+
	+
	+/* {{{ proto AMQPChannel::__construct(AMQPConnection obj)
	+ */
	+PHP_METHOD(amqp_channel_class, __construct)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *connection_object = NULL;
	+
	+ amqp_channel_resource *channel_resource;
	+ amqp_channel_object *channel;
	+ amqp_connection_object *connection;
	+
	+ /* Parse out the method parameters */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &connection_object) == FAILURE) {
	+ zend_throw_exception(amqp_channel_exception_class_entry, "Parameter must be an instance of AMQPConnection.", 0 TSRMLS_CC);
	+ RETURN_NULL();
	+ }
	+
	+ channel = PHP_AMQP_GET_CHANNEL(getThis());
	+
	+ /* Set the prefetch count */
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC);
	+
	+ /* Pull out and verify the connection */
	+ connection = PHP_AMQP_GET_CONNECTION(connection_object);
	+ PHP_AMQP_VERIFY_CONNECTION(connection, "Could not create channel.");
	+
	+ if (!connection->connection_resource) {
	+ zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. No connection resource.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ if (!connection->connection_resource->is_connected) {
	+ zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. Connection resource is not connected.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), connection_object TSRMLS_CC);
	+
	+ channel_resource = (amqp_channel_resource*)ecalloc(1, sizeof(amqp_channel_resource));
	+ channel->channel_resource = channel_resource;
	+
	+ /* Figure out what the next available channel is on this connection */
	+ channel_resource->channel_id = php_amqp_connection_resource_get_available_channel_id(connection->connection_resource);
	+
	+ /* Check that we got a valid channel */
	+ if (!channel_resource->channel_id) {
	+ zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. Connection has no open channel slots remaining.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ if (php_amqp_connection_resource_register_channel(connection->connection_resource, channel_resource, channel_resource->channel_id) == FAILURE) {
	+ zend_throw_exception(amqp_channel_exception_class_entry, "Could not create channel. Failed to add channel to connection slot.", 0 TSRMLS_CC);
	+ }
	+
	+ /* Open up the channel for use */
	+ amqp_channel_open_ok_t *r = amqp_channel_open(channel_resource->connection_resource->connection_state, channel_resource->channel_id);
	+
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+
	+ php_amqp_connection_resource_unregister_channel(channel_resource->connection_resource, channel_resource->channel_id);
	+ channel_resource->channel_id = 0;
	+ return;
	+ }
	+
	+ /* r->channel_id is a 16-bit channel number insibe amqp_bytes_t, assertion below will without converting to uint16_t*/
	+ /* assert (r->channel_id == channel_resource->channel_id);*/
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ channel_resource->is_connected = '\1';
	+
	+ /* Set the prefetch count: */
	+ amqp_basic_qos(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ 0, /* prefetch window size */
	+ (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("prefetch_count"), /* prefetch message count */
	+ /* NOTE that RabbitMQ has reinterpreted global flag field. See https://www.rabbitmq.com/amqp-0-9-1-reference.html#basic.qos.global for details */
	+ 0 /* global flag */
	+ );
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto bool amqp::isConnected()
	+check amqp channel */
	+PHP_METHOD(amqp_channel_class, isConnected)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+
	+ RETURN_BOOL(channel_resource && channel_resource->is_connected);
	+}
	+/* }}} */
	+
	+/* {{{ proto bool amqp::getChannelId()
	+get amqp channel ID */
	+PHP_METHOD(amqp_channel_class, getChannelId)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+
	+ if (!channel_resource) {
	+ RETURN_NULL();
	+ }
	+
	+ RETURN_LONG(channel_resource->channel_id);
	+}
	+/* }}} */
	+
	+/* {{{ proto bool amqp::setPrefetchCount(long count)
	+set the number of prefetches */
	+PHP_METHOD(amqp_channel_class, setPrefetchCount)
	+{
	+ amqp_channel_resource *channel_resource;
	+ PHP5to7_param_long_type_t prefetch_count;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &prefetch_count) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_CONNECTION_RESOURCE(channel_resource, "Could not set prefetch count.");
	+ // TODO: verify that connection is active and resource exists. that is enough
	+
	+ /* If we are already connected, set the new prefetch count */
	+ if (channel_resource->is_connected) {
	+ amqp_basic_qos(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ 0,
	+ (uint16_t)prefetch_count,
	+ 0
	+ );
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+ }
	+
	+ /* Set the prefetch count - the implication is to disable the size */
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), 0 TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto long amqp::setPrefetchCount()
	+get the number of prefetches */
	+PHP_METHOD(amqp_channel_class, getPrefetchCount)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("prefetch_count")
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto bool amqp::setPrefetchSize(long size)
	+set the number of prefetches */
	+PHP_METHOD(amqp_channel_class, setPrefetchSize)
	+{
	+ amqp_channel_resource *channel_resource;
	+ PHP5to7_param_long_type_t prefetch_size;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &prefetch_size) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_CONNECTION_RESOURCE(channel_resource, "Could not set prefetch size.");
	+
	+ /* If we are already connected, set the new prefetch count */
	+ if (channel_resource->is_connected) {
	+ amqp_basic_qos(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (uint16_t)prefetch_size,
	+ 0,
	+ 0
	+ );
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+ }
	+
	+ /* Set the prefetch size - the implication is to disable the count */
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), 0 TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto long amqp::getPrefetchSize()
	+get the number of prefetches */
	+PHP_METHOD(amqp_channel_class, getPrefetchSize)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("prefetch_size")
	+}
	+/* }}} */
	+
	+
	+
	+/* {{{ proto amqp::qos(long size, long count)
	+set the number of prefetches */
	+PHP_METHOD(amqp_channel_class, qos)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+ PHP5to7_param_long_type_t prefetch_size;
	+ PHP5to7_param_long_type_t prefetch_count;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &prefetch_size, &prefetch_count) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_CONNECTION_RESOURCE(channel_resource, "Could not set qos parameters.");
	+
	+ /* Set the prefetch size - the implication is to disable the count */
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), prefetch_size TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), prefetch_count TSRMLS_CC);
	+
	+ /* If we are already connected, set the new prefetch count */
	+ if (channel_resource->is_connected) {
	+ amqp_basic_qos(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("prefetch_size"),
	+ (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("prefetch_count"),
	+ /* NOTE that RabbitMQ has reinterpreted global flag field. See https://www.rabbitmq.com/amqp-0-9-1-reference.html#basic.qos.global for details */
	+ 0 /* Global flag - whether this change should affect every channel_resource */
	+ );
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::startTransaction()
	+start a transaction on the given channel */
	+PHP_METHOD(amqp_channel_class, startTransaction)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ amqp_rpc_reply_t res;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not start the transaction.");
	+
	+ amqp_tx_select(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id
	+ );
	+
	+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::startTransaction()
	+start a transaction on the given channel */
	+PHP_METHOD(amqp_channel_class, commitTransaction)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ amqp_rpc_reply_t res;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not start the transaction.");
	+
	+ amqp_tx_commit(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id
	+ );
	+
	+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::startTransaction()
	+start a transaction on the given channel */
	+PHP_METHOD(amqp_channel_class, rollbackTransaction)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ amqp_rpc_reply_t res;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
	+ return;
	+ }
	+
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not rollback the transaction.");
	+
	+ amqp_tx_rollback(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id
	+ );
	+
	+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPChannel::getConnection()
	+Get the AMQPConnection object in use */
	+PHP_METHOD(amqp_channel_class, getConnection)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("connection")
	+}
	+/* }}} */
	+
	+/* {{{ proto bool amqp::basicRecover([bool requeue=TRUE])
	+Redeliver unacknowledged messages */
	+PHP_METHOD(amqp_channel_class, basicRecover)
	+{
	+ amqp_channel_resource *channel_resource;
	+
	+ amqp_rpc_reply_t res;
	+
	+ zend_bool requeue = 1;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|b", &requeue) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not redeliver unacknowledged messages.");
	+
	+ amqp_basic_recover(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (amqp_boolean_t) requeue
	+ );
	+
	+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+
	+}
	+/* }}} */
	+
	+
	+/* amqp_channel_class ARG_INFO definition */
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_OBJ_INFO(0, amqp_connection, AMQPConnection, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_isConnected, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getChannelId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setPrefetchSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, size)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getPrefetchSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setPrefetchCount, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, count)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getPrefetchCount, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_qos, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	+ ZEND_ARG_INFO(0, size)
	+ ZEND_ARG_INFO(0, count)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_startTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_commitTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_rollbackTransaction, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_basicRecover, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_INFO(0, requeue)
	+ZEND_END_ARG_INFO()
	+
	+
	+zend_function_entry amqp_channel_class_functions[] = {
	+ PHP_ME(amqp_channel_class, __construct, arginfo_amqp_channel_class__construct, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, isConnected, arginfo_amqp_channel_class_isConnected, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_channel_class, getChannelId, arginfo_amqp_channel_class_getChannelId, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_channel_class, setPrefetchSize, arginfo_amqp_channel_class_setPrefetchSize, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, getPrefetchSize, arginfo_amqp_channel_class_getPrefetchSize, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, setPrefetchCount,arginfo_amqp_channel_class_setPrefetchCount,ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, getPrefetchCount,arginfo_amqp_channel_class_getPrefetchCount,ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, qos, arginfo_amqp_channel_class_qos, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_channel_class, startTransaction, arginfo_amqp_channel_class_startTransaction, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, commitTransaction, arginfo_amqp_channel_class_commitTransaction, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_channel_class, rollbackTransaction, arginfo_amqp_channel_class_rollbackTransaction, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_channel_class, getConnection, arginfo_amqp_channel_class_getConnection, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_channel_class, basicRecover, arginfo_amqp_channel_class_basicRecover, ZEND_ACC_PUBLIC)
	+
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+
	+PHP_MINIT_FUNCTION(amqp_channel)
	+{
	+ zend_class_entry ce;
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPChannel", amqp_channel_class_functions);
	+ ce.create_object = amqp_channel_ctor;
	+ amqp_channel_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("connection"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("prefetch_count"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_long(this_ce, ZEND_STRL("prefetch_size"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+#if PHP_MAJOR_VERSION >=7
	+ memcpy(&amqp_channel_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	+
	+ amqp_channel_object_handlers.offset = XtOffsetOf(amqp_connection_object, zo);
	+ amqp_channel_object_handlers.free_obj = amqp_channel_free;
	+#endif
	+
	+ return SUCCESS;
	+}
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.6.1/amqp_channel.h b/amqp-1.7.0alpha1/amqp_channel.h
	similarity index 92%
	rename from amqp-1.6.1/amqp_channel.h
	rename to amqp-1.7.0alpha1/amqp_channel.h
	index 4f77159..1a12d09 100644
	--- a/amqp-1.6.1/amqp_channel.h
	+++ b/amqp-1.7.0alpha1/amqp_channel.h
	@@ -1,54 +1,56 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_channel.h 305865 2010-12-01 01:30:56Z pdezwart $ */

	-void php_amqp_close_channel(amqp_channel_object *channel TSRMLS_DC);
	-void amqp_channel_dtor(void *object TSRMLS_DC);
	-zend_object_value amqp_channel_ctor(zend_class_entry *ce TSRMLS_DC);
	+extern zend_class_entry *amqp_channel_class_entry;
	+
	+void php_amqp_close_channel(amqp_channel_resource *channel_resource TSRMLS_DC);

	PHP_METHOD(amqp_channel_class, __construct);
	PHP_METHOD(amqp_channel_class, isConnected);
	PHP_METHOD(amqp_channel_class, getChannelId);
	PHP_METHOD(amqp_channel_class, setPrefetchSize);
	PHP_METHOD(amqp_channel_class, getPrefetchSize);
	PHP_METHOD(amqp_channel_class, setPrefetchCount);
	PHP_METHOD(amqp_channel_class, getPrefetchCount);
	PHP_METHOD(amqp_channel_class, qos);

	PHP_METHOD(amqp_channel_class, startTransaction);
	PHP_METHOD(amqp_channel_class, commitTransaction);
	PHP_METHOD(amqp_channel_class, rollbackTransaction);

	PHP_METHOD(amqp_channel_class, getConnection);

	PHP_METHOD(amqp_channel_class, basicRecover);

	+PHP_MINIT_FUNCTION(amqp_channel);
	+
	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/amqp_connection.c b/amqp-1.7.0alpha1/amqp_connection.c
	new file mode 100644
	index 0000000..fc98c0d
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp_connection.c
	@@ -0,0 +1,1319 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+# include <signal.h>
	+# include <stdint.h>
	+#endif
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+#include <amqp_tcp_socket.h>
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+# include <unistd.h>
	+#endif
	+
	+#include "php_amqp.h"
	+#include "amqp_channel.h"
	+#include "amqp_connection_resource.h"
	+#include "amqp_connection.h"
	+
	+#ifndef E_DEPRECATED
	+#define E_DEPRECATED E_WARNING
	+#endif
	+
	+zend_class_entry *amqp_connection_class_entry;
	+#define this_ce amqp_connection_class_entry
	+
	+zend_object_handlers amqp_connection_object_handlers;
	+
	+
	+static void php_amqp_cleanup_connection_resource(amqp_connection_resource *connection_resource TSRMLS_DC)
	+{
	+ if (!connection_resource) {
	+ return;
	+ }
	+
	+ PHP5to7_zend_resource_t resource = connection_resource->resource;
	+
	+ connection_resource->parent = NULL;
	+
	+ if (connection_resource->is_dirty) {
	+ if (connection_resource->is_persistent) {
	+
	+ PHP5to7_zend_resource_le_t *le = PHP5to7_ZEND_RESOURCE_LE_EMPTY;
	+
	+ if (PHP5to7_ZEND_HASH_FIND(&EG(persistent_list), connection_resource->resource_key, connection_resource->resource_key_len + 1, le)) {
	+
	+ if (PHP5to7_ZEND_RSRC_TYPE_P(Z_RES_P(le)) == le_amqp_connection_resource_persistent) {
	+ PHP5to7_ZEND_HASH_DEL(&EG(persistent_list), connection_resource->resource_key, (uint)(connection_resource->resource_key_len + 1));
	+ }
	+ }
	+ }
	+
	+ zend_list_delete(resource);
	+ } else {
	+ if (connection_resource->is_persistent) {
	+ connection_resource->resource = PHP5to7_ZEND_RESOURCE_EMPTY;
	+ }
	+
	+ if (connection_resource->resource != PHP5to7_ZEND_RESOURCE_EMPTY) {
	+ zend_list_delete(resource);
	+ }
	+ }
	+}
	+
	+static void php_amqp_disconnect(amqp_connection_resource *resource TSRMLS_DC)
	+{
	+ php_amqp_prepare_for_disconnect(resource TSRMLS_CC);
	+ php_amqp_cleanup_connection_resource(resource TSRMLS_CC);
	+}
	+
	+
	+static void php_amqp_disconnect_force(amqp_connection_resource *resource TSRMLS_DC)
	+{
	+ php_amqp_prepare_for_disconnect(resource TSRMLS_CC);
	+ resource->is_dirty = '\1';
	+ php_amqp_cleanup_connection_resource(resource TSRMLS_CC);
	+}
	+
	+/**
	+ * php_amqp_connect
	+ * handles connecting to amqp
	+ * called by connect(), pconnect(), reconnect(), preconnect()
	+ */
	+int php_amqp_connect(amqp_connection_object *connection, zend_bool persistent, INTERNAL_FUNCTION_PARAMETERS)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+
	+ if (connection->connection_resource) {
	+ /* Clean up old memory allocations which are now invalid (new connection) */
	+ php_amqp_cleanup_connection_resource(connection->connection_resource TSRMLS_CC);
	+
	+ connection->connection_resource = NULL;
	+ }
	+
	+ assert(connection->connection_resource == NULL);
	+
	+ amqp_connection_params connection_params;
	+
	+ connection_params.host = PHP_AMQP_READ_THIS_PROP_STR("host");
	+ connection_params.port = (int)PHP_AMQP_READ_THIS_PROP_LONG("port");
	+ connection_params.vhost = PHP_AMQP_READ_THIS_PROP_STR("vhost");
	+ connection_params.login = PHP_AMQP_READ_THIS_PROP_STR("login");
	+ connection_params.password = PHP_AMQP_READ_THIS_PROP_STR("password");
	+ connection_params.frame_max = (int) PHP_AMQP_READ_THIS_PROP_LONG("frame_max");
	+ connection_params.channel_max = (int) PHP_AMQP_READ_THIS_PROP_LONG("channel_max");
	+ connection_params.heartbeat = (int) PHP_AMQP_READ_THIS_PROP_LONG("heartbeat");
	+ connection_params.read_timeout = (int) PHP_AMQP_READ_THIS_PROP_DOUBLE("read_timeout");
	+ connection_params.write_timeout = (int) PHP_AMQP_READ_THIS_PROP_DOUBLE("write_timeout");
	+ connection_params.connect_timeout = (int) PHP_AMQP_READ_THIS_PROP_DOUBLE("connect_timeout");
	+
	+
	+ if (persistent) {
	+ PHP5to7_zend_resource_store_t *le = PHP5to7_ZEND_RESOURCE_EMPTY;
	+
	+ /* Look for an established resource */
	+ key_len = spprintf(&key, 0,
	+ "amqp_conn_res_%s_%d_%s_%s_%s_%d_%d_%d",
	+ connection_params.host,
	+ connection_params.port,
	+ connection_params.vhost,
	+ connection_params.login,
	+ connection_params.password,
	+ connection_params.frame_max,
	+ connection_params.channel_max,
	+ connection_params.heartbeat
	+ );
	+
	+ if (PHP5to7_ZEND_HASH_STR_FIND_PTR(&EG(persistent_list), key, key_len + 1, le)) {
	+ efree(key);
	+
	+ if (le->type != le_amqp_connection_resource_persistent) {
	+ /* hash conflict, given name associate with non-amqp persistent connection resource */
	+ return 0;
	+ }
	+
	+ /* An entry for this connection resource already exists */
	+ /* Stash the connection resource in the connection */
	+ connection->connection_resource = le->ptr;
	+
	+ if (connection->connection_resource->resource != PHP5to7_ZEND_RESOURCE_EMPTY) {
	+ /* resource in use! */
	+ connection->connection_resource = NULL;
	+
	+ zend_throw_exception(amqp_connection_exception_class_entry, "There are already established persistent connection to the same resource.", 0 TSRMLS_CC);
	+ return 0;
	+ }
	+
	+ connection->connection_resource->resource = PHP5to7_ZEND_REGISTER_RESOURCE(connection->connection_resource, persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource);
	+ connection->connection_resource->parent = connection;
	+
	+ /* Set desired timeouts */
	+ if (php_amqp_set_resource_read_timeout(connection->connection_resource, PHP_AMQP_READ_THIS_PROP_DOUBLE("read_timeout") TSRMLS_CC) == 0
	+ \|\| php_amqp_set_resource_write_timeout(connection->connection_resource, PHP_AMQP_READ_THIS_PROP_DOUBLE("write_timeout") TSRMLS_CC) == 0) {
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+ return 0;
	+ }
	+
	+ /* Set connection status to connected */
	+ connection->connection_resource->is_connected = '\1';
	+ connection->connection_resource->is_persistent = persistent;
	+
	+ return 1;
	+ }
	+
	+ efree(key);
	+ }
	+
	+ connection->connection_resource = connection_resource_constructor(&connection_params, persistent TSRMLS_CC);
	+
	+ if (connection->connection_resource == NULL) {
	+ return 0;
	+ }
	+
	+ connection->connection_resource->resource = PHP5to7_ZEND_REGISTER_RESOURCE(connection->connection_resource, persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource);
	+ connection->connection_resource->parent = connection;
	+
	+ /* Set connection status to connected */
	+ connection->connection_resource->is_connected = '\1';
	+
	+ if (persistent) {
	+ connection->connection_resource->is_persistent = persistent;
	+
	+ key_len = spprintf(&key, 0,
	+ "amqp_conn_res_%s_%d_%s_%s_%s_%d_%d_%d",
	+ connection_params.host,
	+ connection_params.port,
	+ connection_params.vhost,
	+ connection_params.login,
	+ connection_params.password,
	+ connection_params.frame_max,
	+ connection_params.channel_max,
	+ connection_params.heartbeat
	+ );
	+
	+ connection->connection_resource->resource_key = pestrndup(key, (uint) key_len, persistent);
	+ connection->connection_resource->resource_key_len = key_len;
	+
	+ efree(key);
	+
	+ PHP5to7_zend_resource_store_t new_le;
	+
	+ /* Store a reference in the persistence list */
	+ new_le.ptr = connection->connection_resource;
	+ new_le.type = persistent ? le_amqp_connection_resource_persistent : le_amqp_connection_resource;
	+
	+ if (!PHP5to7_ZEND_HASH_STR_UPD_MEM(&EG(persistent_list), connection->connection_resource->resource_key, connection->connection_resource->resource_key_len + 1, new_le, sizeof(PHP5to7_zend_resource_store_t))) {
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+ return 0;
	+ }
	+ }
	+
	+ return 1;
	+}
	+
	+void amqp_connection_free(PHP5to7_obj_free_zend_object *object TSRMLS_DC)
	+{
	+ amqp_connection_object *connection = PHP_AMQP_FETCH_CONNECTION(object);
	+
	+ if (connection->connection_resource) {
	+ php_amqp_disconnect(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+ }
	+
	+ zend_object_std_dtor(&connection->zo TSRMLS_CC);
	+
	+#if PHP_MAJOR_VERSION < 7
	+ efree(object);
	+#endif
	+}
	+
	+PHP5to7_zend_object_value amqp_connection_ctor(zend_class_entry *ce TSRMLS_DC)
	+{
	+ amqp_connection_object* connection = PHP5to7_ECALLOC_CONNECTION_OBJECT(ce);
	+
	+ zend_object_std_init(&connection->zo, ce TSRMLS_CC);
	+ AMQP_OBJECT_PROPERTIES_INIT(connection->zo, ce);
	+
	+#if PHP_MAJOR_VERSION >=7
	+ connection->zo.handlers = &amqp_connection_object_handlers;
	+
	+ return &connection->zo;
	+#else
	+ PHP5to7_zend_object_value new_value;
	+
	+ new_value.handle = zend_objects_store_put(
	+ connection,
	+ NULL,
	+ (zend_objects_free_object_storage_t) amqp_connection_free,
	+ NULL TSRMLS_CC
	+ );
	+
	+ new_value.handlers = zend_get_std_object_handlers();
	+
	+ return new_value;
	+#endif
	+}
	+
	+
	+/* {{{ proto AMQPConnection::__construct([array optional])
	+ * The array can contain 'host', 'port', 'login', 'password', 'vhost', 'read_timeout', 'write_timeout', 'connect_timeout' and 'timeout' (deprecated) indexes
	+ */
	+PHP_METHOD(amqp_connection_class, __construct)
	+{
	+ zval* ini_arr = NULL;
	+
	+ PHP5to7_zval_t *zdata = NULL;
	+
	+ /* Parse out the method parameters */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|a", &ini_arr) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Pull the login out of the $params array */
	+ zdata = NULL;
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "login", sizeof("login"), zdata)) {
	+ // TODO: check whether we need separate zval
	+ convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
	+ }
	+ /* Validate the given login */
	+ if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("login"), PHP5to7_MAYBE_DEREF(zdata)TSRMLS_CC);
	+ } else {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'login' exceeds 128 character limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+ } else {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), INI_STR("amqp.login"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.login")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC);
	+ }
	+
	+ /* Pull the password out of the $params array */
	+ zdata = NULL;
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "password", sizeof("password"), zdata)) {
	+ convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
	+ }
	+ /* Validate the given password */
	+ if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ } else {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'password' exceeds 128 character limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+ } else {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), INI_STR("amqp.password"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.password")) > 128 ? 128 : strlen(INI_STR("amqp.login"))) TSRMLS_CC);
	+ }
	+
	+ /* Pull the host out of the $params array */
	+ zdata = NULL;
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "host", sizeof("host"), zdata)) {
	+ convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
	+ }
	+ /* Validate the given host */
	+ if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ } else {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'host' exceeds 128 character limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+ } else {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), INI_STR("amqp.host"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.host")) > 128 ? 128 : strlen(INI_STR("amqp.host"))) TSRMLS_CC);
	+ }
	+
	+ /* Pull the vhost out of the $params array */
	+ zdata = NULL;
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "vhost", sizeof("vhost"), zdata)) {
	+ convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
	+ }
	+ /* Validate the given vhost */
	+ if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) < 128) {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)), Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ } else {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 character limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+ } else {
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), INI_STR("amqp.vhost"), (PHP5to7_param_str_len_type_t) (strlen(INI_STR("amqp.vhost")) > 128 ? 128 : strlen(INI_STR("amqp.vhost"))) TSRMLS_CC);
	+
	+ }
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), INI_INT("amqp.port") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "port", sizeof("port"), zdata)) {
	+ convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("port"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "read_timeout", sizeof("read_timeout"), zdata)) {
	+ convert_to_double(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ } else {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "timeout", sizeof("timeout"), zdata)) {
	+ /* 'read_timeout' takes precedence on 'timeout' but users have to know this */
	+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Parameter 'timeout' is deprecated, 'read_timeout' used instead");
	+ }
	+
	+ } else if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "timeout", sizeof("timeout"), zdata)) {
	+
	+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "Parameter 'timeout' is deprecated; use 'read_timeout' instead");
	+
	+ convert_to_double(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ } else {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+ } else {
	+
	+ assert(DEFAULT_TIMEOUT != NULL);
	+ if (strcmp(DEFAULT_TIMEOUT, INI_STR("amqp.timeout")) != 0) {
	+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "INI setting 'amqp.timeout' is deprecated; use 'amqp.read_timeout' instead");
	+
	+ if (strcmp(DEFAULT_READ_TIMEOUT, INI_STR("amqp.read_timeout")) == 0) {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.timeout") TSRMLS_CC);
	+ } else {
	+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "INI setting 'amqp.read_timeout' will be used instead of 'amqp.timeout'");
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
	+ }
	+ } else {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), INI_FLT("amqp.read_timeout") TSRMLS_CC);
	+ }
	+ }
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), INI_FLT("amqp.write_timeout") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "write_timeout", sizeof("write_timeout"), zdata)) {
	+ convert_to_double(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ } else {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+ }
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), INI_FLT("amqp.connect_timeout") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "connect_timeout", sizeof("connect_timeout"), zdata)) {
	+ convert_to_double(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'connect_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ } else {
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("connect_timeout"), Z_DVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+
	+ }
	+ }
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), INI_INT("amqp.channel_max") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "channel_max", sizeof("channel_max"), zdata)) {
	+ convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0 \|\| Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) > PHP_AMQP_MAX_CHANNELS) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'channel_max' is out of range.", 0 TSRMLS_CC);
	+ } else {
	+ if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) {
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), PHP_AMQP_DEFAULT_CHANNEL_MAX TSRMLS_CC);
	+ } else {
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("channel_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+ }
	+ }
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), INI_INT("amqp.frame_max") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "frame_max", sizeof("frame_max"), zdata)) {
	+ convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0 \|\| Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) > PHP_AMQP_MAX_FRAME) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'frame_max' is out of range.", 0 TSRMLS_CC);
	+ } else {
	+ if(Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) == 0) {
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), PHP_AMQP_DEFAULT_FRAME_MAX TSRMLS_CC);
	+ } else {
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("frame_max"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+ }
	+ }
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), INI_INT("amqp.heartbeat") TSRMLS_CC);
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "heartbeat", sizeof("heartbeat"), zdata)) {
	+ convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
	+ if (Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) < 0 \|\| Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) > PHP_AMQP_MAX_HEARTBEAT) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'heartbeat' is out of range.", 0 TSRMLS_CC);
	+ } else {
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("heartbeat"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
	+ }
	+ }
	+
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::isConnected()
	+check amqp connection */
	+PHP_METHOD(amqp_connection_class, isConnected)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ /* If the channel_connect is 1, we have a connection */
	+ if (connection->connection_resource != NULL && connection->connection_resource->is_connected) {
	+ RETURN_TRUE;
	+ }
	+
	+ /* We have no connection */
	+ RETURN_FALSE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::connect()
	+create amqp connection */
	+PHP_METHOD(amqp_connection_class, connect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+ if (connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to start transient connection while persistent transient one already established. Continue.");
	+ }
	+
	+ RETURN_TRUE;
	+ }
	+
	+ /* Actually connect this resource to the broker */
	+ RETURN_BOOL(php_amqp_connect(connection, 0, INTERNAL_FUNCTION_PARAM_PASSTHRU));
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::connect()
	+create amqp connection */
	+PHP_METHOD(amqp_connection_class, pconnect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+
	+ assert(connection->connection_resource != NULL);
	+ if (!connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to start persistent connection while transient one already established. Continue.");
	+ }
	+
	+ RETURN_TRUE;
	+ }
	+
	+ /* Actually connect this resource to the broker or use stored connection */
	+ RETURN_BOOL(php_amqp_connect(connection, 1, INTERNAL_FUNCTION_PARAM_PASSTHRU));
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp:pdisconnect()
	+destroy amqp persistent connection */
	+PHP_METHOD(amqp_connection_class, pdisconnect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ RETURN_TRUE;
	+ }
	+
	+ assert(connection->connection_resource != NULL);
	+
	+ if (!connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close persistent connection while transient one already established. Abort.");
	+
	+ RETURN_FALSE;
	+ }
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::disconnect()
	+destroy amqp connection */
	+PHP_METHOD(amqp_connection_class, disconnect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ RETURN_TRUE;
	+ }
	+
	+ if (connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to close transient connection while persistent one already established. Abort.");
	+
	+ RETURN_FALSE;
	+ }
	+
	+ assert(connection->connection_resource != NULL);
	+
	+ php_amqp_disconnect(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+
	+ RETURN_TRUE;
	+}
	+
	+/* }}} */
	+
	+/* {{{ proto amqp::reconnect()
	+recreate amqp connection */
	+PHP_METHOD(amqp_connection_class, reconnect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+
	+ assert(connection->connection_resource != NULL);
	+
	+ if (connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to reconnect persistent connection while transient one already established. Abort.");
	+
	+ RETURN_FALSE;
	+ }
	+
	+ php_amqp_disconnect(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+ }
	+
	+ RETURN_BOOL(php_amqp_connect(connection, 0, INTERNAL_FUNCTION_PARAM_PASSTHRU));
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::preconnect()
	+recreate amqp connection */
	+PHP_METHOD(amqp_connection_class, preconnect)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+
	+ assert(connection->connection_resource != NULL);
	+
	+ if (!connection->connection_resource->is_persistent) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to reconnect transient connection while persistent one already established. Abort.");
	+
	+ RETURN_FALSE;
	+ }
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+ }
	+
	+ RETURN_BOOL(php_amqp_connect(connection, 1, INTERNAL_FUNCTION_PARAM_PASSTHRU));
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::getLogin()
	+get the login */
	+PHP_METHOD(amqp_connection_class, getLogin)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("login");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::setLogin(string login)
	+set the login */
	+PHP_METHOD(amqp_connection_class, setLogin)
	+{
	+ char *login = NULL; PHP5to7_param_str_len_type_t login_len = 0;
	+
	+ /* Get the login from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &login, &login_len) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate login length */
	+ if (login_len > 128) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'login' given, exceeds 128 characters limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("login"), login, login_len TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getPassword()
	+get the password */
	+PHP_METHOD(amqp_connection_class, getPassword)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("password");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::setPassword(string password)
	+set the password */
	+PHP_METHOD(amqp_connection_class, setPassword)
	+{
	+ char *password = NULL; PHP5to7_param_str_len_type_t password_len = 0;
	+
	+ /* Get the password from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &password, &password_len) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate password length */
	+ if (password_len > 128) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'password' given, exceeds 128 characters limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("password"), password, password_len TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::getHost()
	+get the host */
	+PHP_METHOD(amqp_connection_class, getHost)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("host");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::setHost(string host)
	+set the host */
	+PHP_METHOD(amqp_connection_class, setHost)
	+{
	+ char *host = NULL; PHP5to7_param_str_len_type_t host_len = 0;
	+
	+ /* Get the host from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &host, &host_len) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate host length */
	+ if (host_len > 1024) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Invalid 'host' given, exceeds 1024 character limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("host"), host, host_len TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::getPort()
	+get the port */
	+PHP_METHOD(amqp_connection_class, getPort)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("port");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::setPort(mixed port)
	+set the port */
	+PHP_METHOD(amqp_connection_class, setPort)
	+{
	+ zval *zvalPort;
	+ int port;
	+
	+ /* Get the port from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zvalPort) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Parse out the port*/
	+ switch (Z_TYPE_P(zvalPort)) {
	+ case IS_DOUBLE:
	+ port = (int)Z_DVAL_P(zvalPort);
	+ break;
	+ case IS_LONG:
	+ port = (int)Z_LVAL_P(zvalPort);
	+ break;
	+ case IS_STRING:
	+ convert_to_long(zvalPort);
	+ port = (int)Z_LVAL_P(zvalPort);
	+ break;
	+ default:
	+ port = 0;
	+ }
	+
	+ /* Check the port value */
	+ if (port <= 0 \|\| port > 65535) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Invalid port given. Value must be between 1 and 65535.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("read_timeout"), port TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getVhost()
	+get the vhost */
	+PHP_METHOD(amqp_connection_class, getVhost)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("vhost");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto amqp::setVhost(string vhost)
	+set the vhost */
	+PHP_METHOD(amqp_connection_class, setVhost)
	+{
	+ char *vhost = NULL; PHP5to7_param_str_len_type_t vhost_len = 0;
	+
	+ /* Get the vhost from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &vhost, &vhost_len) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate vhost length */
	+ if (vhost_len > 128) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'vhost' exceeds 128 characters limit.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("vhost"), vhost, vhost_len TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getTimeout()
	+@deprecated
	+get the timeout */
	+PHP_METHOD(amqp_connection_class, getTimeout)
	+{
	+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "AMQPConnection::getTimeout() method is deprecated; use AMQPConnection::getReadTimeout() instead");
	+
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("read_timeout");
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::setTimeout(double timeout)
	+@deprecated
	+set the timeout */
	+PHP_METHOD(amqp_connection_class, setTimeout)
	+{
	+ amqp_connection_object *connection;
	+ double read_timeout;
	+
	+ php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "AMQPConnection::setTimeout($timeout) method is deprecated; use AMQPConnection::setReadTimeout($timeout) instead");
	+
	+ /* Get the timeout from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &read_timeout) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate timeout */
	+ if (read_timeout < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+ if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) {
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+
	+ RETURN_FALSE;
	+ }
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getReadTimeout()
	+get the read timeout */
	+PHP_METHOD(amqp_connection_class, getReadTimeout)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("read_timeout");
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::setReadTimeout(double timeout)
	+set read timeout */
	+PHP_METHOD(amqp_connection_class, setReadTimeout)
	+{
	+ amqp_connection_object *connection;
	+ double read_timeout;
	+
	+ /* Get the timeout from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &read_timeout) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate timeout */
	+ if (read_timeout < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'read_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("read_timeout"), read_timeout TSRMLS_CC);
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+ if (php_amqp_set_resource_read_timeout(connection->connection_resource, read_timeout TSRMLS_CC) == 0) {
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+
	+ RETURN_FALSE;
	+ }
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getWriteTimeout()
	+get write timeout */
	+PHP_METHOD(amqp_connection_class, getWriteTimeout)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("write_timeout");
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::setWriteTimeout(double timeout)
	+set write timeout */
	+PHP_METHOD(amqp_connection_class, setWriteTimeout)
	+{
	+ amqp_connection_object *connection;
	+ double write_timeout;
	+
	+ /* Get the timeout from the method params */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &write_timeout) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Validate timeout */
	+ if (write_timeout < 0) {
	+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'write_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("write_timeout"), write_timeout TSRMLS_CC);
	+
	+ if (connection->connection_resource && connection->connection_resource->is_connected) {
	+ if (php_amqp_set_resource_write_timeout(connection->connection_resource, write_timeout TSRMLS_CC) == 0) {
	+
	+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
	+ connection->connection_resource = NULL;
	+
	+ RETURN_FALSE;
	+ }
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getUsedChannels()
	+Get max used channels number */
	+PHP_METHOD(amqp_connection_class, getUsedChannels)
	+{
	+ amqp_connection_object *connection;
	+
	+ /* Get the timeout from the method params */
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	+
	+ RETURN_LONG(0);
	+ }
	+
	+ RETURN_LONG(connection->connection_resource->used_slots);
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getMaxChannels()
	+Get max supported channels number per connection */
	+PHP_METHOD(amqp_connection_class, getMaxChannels)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	+
	+ RETURN_NULL();
	+ }
	+
	+ RETURN_LONG(connection->connection_resource->max_slots);
	+}
	+/* }}} */
	+
	+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	+/* {{{ proto amqp::getMaxFrameSize()
	+Get max supported frame size per connection in bytes */
	+PHP_METHOD(amqp_connection_class, getMaxFrameSize)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	+
	+ RETURN_NULL();
	+ }
	+
	+ RETURN_LONG(amqp_get_frame_max(connection->connection_resource->connection_state));
	+}
	+/* }}} */
	+
	+/* {{{ proto amqp::getHeartbeatInterval()
	+Get number of seconds between heartbeats of the connection in seconds */
	+PHP_METHOD(amqp_connection_class, getHeartbeatInterval)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* Get the connection object out of the store */
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ if (!connection->connection_resource \|\| !connection->connection_resource->is_connected) {
	+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection is not connected.");
	+
	+ RETURN_NULL();
	+ }
	+
	+ RETURN_LONG(amqp_get_heartbeat(connection->connection_resource->connection_state));
	+}
	+/* }}} */
	+#endif
	+
	+/* {{{ proto amqp::isPersistent()
	+check whether amqp connection is persistent */
	+PHP_METHOD(amqp_connection_class, isPersistent)
	+{
	+ amqp_connection_object *connection;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ connection = PHP_AMQP_GET_CONNECTION(getThis());
	+
	+ RETURN_BOOL(connection->connection_resource && connection->connection_resource->is_persistent);
	+}
	+/* }}} */
	+
	+
	+/* amqp_connection_class ARG_INFO definition */
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_ARRAY_INFO(0, credentials, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_isConnected, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_connect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_pconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_pdisconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_disconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_reconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_preconnect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getLogin, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setLogin, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, login)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getPassword, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setPassword, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, password)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getHost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setHost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, host)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getPort, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setPort, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, port)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getVhost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setVhost, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, vhost)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, timeout)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getReadTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setReadTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, timeout)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getWriteTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setWriteTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, timeout)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getUsedChannels, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getMaxChannels, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getMaxFrameSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getHeartbeatInterval, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+#endif
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_isPersistent, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+
	+zend_function_entry amqp_connection_class_functions[] = {
	+ PHP_ME(amqp_connection_class, __construct, arginfo_amqp_connection_class__construct, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, isConnected, arginfo_amqp_connection_class_isConnected, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, connect, arginfo_amqp_connection_class_connect, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, pconnect, arginfo_amqp_connection_class_pconnect, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, pdisconnect, arginfo_amqp_connection_class_pdisconnect, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, disconnect, arginfo_amqp_connection_class_disconnect, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, reconnect, arginfo_amqp_connection_class_reconnect, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, preconnect, arginfo_amqp_connection_class_preconnect, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getLogin, arginfo_amqp_connection_class_getLogin, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setLogin, arginfo_amqp_connection_class_setLogin, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getPassword, arginfo_amqp_connection_class_getPassword, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setPassword, arginfo_amqp_connection_class_setPassword, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getHost, arginfo_amqp_connection_class_getHost, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setHost, arginfo_amqp_connection_class_setHost, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getPort, arginfo_amqp_connection_class_getPort, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setPort, arginfo_amqp_connection_class_setPort, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getVhost, arginfo_amqp_connection_class_getVhost, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setVhost, arginfo_amqp_connection_class_setVhost, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getTimeout, arginfo_amqp_connection_class_getTimeout, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setTimeout, arginfo_amqp_connection_class_setTimeout, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getReadTimeout, arginfo_amqp_connection_class_getReadTimeout, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setReadTimeout, arginfo_amqp_connection_class_setReadTimeout, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getWriteTimeout, arginfo_amqp_connection_class_getWriteTimeout, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, setWriteTimeout, arginfo_amqp_connection_class_setWriteTimeout, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_connection_class, getUsedChannels, arginfo_amqp_connection_class_getUsedChannels, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, getMaxChannels, arginfo_amqp_connection_class_getMaxChannels, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, isPersistent, arginfo_amqp_connection_class_isPersistent, ZEND_ACC_PUBLIC)
	+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	+ PHP_ME(amqp_connection_class, getHeartbeatInterval, arginfo_amqp_connection_class_getHeartbeatInterval, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_connection_class, getMaxFrameSize, arginfo_amqp_connection_class_getMaxFrameSize, ZEND_ACC_PUBLIC)
	+#endif
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+
	+
	+PHP_MINIT_FUNCTION(amqp_connection)
	+{
	+ zend_class_entry ce;
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPConnection", amqp_connection_class_functions);
	+ ce.create_object = amqp_connection_ctor;
	+ this_ce = zend_register_internal_class(&ce TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("login"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("password"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("host"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("vhost"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("port"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("read_timeout"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("write_timeout"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("connect_timeout"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("channel_max"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("frame_max"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("heartbeat"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+#if PHP_MAJOR_VERSION >=7
	+ memcpy(&amqp_connection_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
	+
	+ amqp_connection_object_handlers.offset = XtOffsetOf(amqp_connection_object, zo);
	+ amqp_connection_object_handlers.free_obj = amqp_connection_free;
	+#endif
	+
	+ return SUCCESS;
	+}
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<6
	+*/
	diff --git a/amqp-1.6.1/amqp_connection.h b/amqp-1.7.0alpha1/amqp_connection.h
	similarity index 89%
	rename from amqp-1.6.1/amqp_connection.h
	rename to amqp-1.7.0alpha1/amqp_connection.h
	index 2c6ef92..ccebc07 100644
	--- a/amqp-1.6.1/amqp_connection.h
	+++ b/amqp-1.7.0alpha1/amqp_connection.h
	@@ -1,85 +1,80 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_connection.h 326660 2012-07-17 05:32:34Z pdezwart $ */

	+extern zend_class_entry *amqp_connection_class_entry;

	-void amqp_connection_dtor(void *object TSRMLS_DC);
	-zend_object_value amqp_connection_ctor(zend_class_entry *ce TSRMLS_DC);
	-
	-void php_amqp_connect(amqp_connection_object *amqp_connection, int persistent TSRMLS_DC);
	-void php_amqp_disconnect_force(amqp_connection_object *connection TSRMLS_DC);
	-void php_amqp_disconnect_safe(amqp_connection_object *connection TSRMLS_DC);
	-
	-
	-
	+int php_amqp_connect(amqp_connection_object *amqp_connection, zend_bool persistent, INTERNAL_FUNCTION_PARAMETERS);

	PHP_METHOD(amqp_connection_class, __construct);
	PHP_METHOD(amqp_connection_class, isConnected);
	PHP_METHOD(amqp_connection_class, connect);
	PHP_METHOD(amqp_connection_class, pconnect);
	PHP_METHOD(amqp_connection_class, pdisconnect);
	PHP_METHOD(amqp_connection_class, disconnect);
	PHP_METHOD(amqp_connection_class, reconnect);
	PHP_METHOD(amqp_connection_class, preconnect);

	PHP_METHOD(amqp_connection_class, getLogin);
	PHP_METHOD(amqp_connection_class, setLogin);

	PHP_METHOD(amqp_connection_class, getPassword);
	PHP_METHOD(amqp_connection_class, setPassword);

	PHP_METHOD(amqp_connection_class, getHost);
	PHP_METHOD(amqp_connection_class, setHost);

	PHP_METHOD(amqp_connection_class, getPort);
	PHP_METHOD(amqp_connection_class, setPort);

	PHP_METHOD(amqp_connection_class, getVhost);
	PHP_METHOD(amqp_connection_class, setVhost);

	PHP_METHOD(amqp_connection_class, getTimeout);
	PHP_METHOD(amqp_connection_class, setTimeout);

	PHP_METHOD(amqp_connection_class, getReadTimeout);
	PHP_METHOD(amqp_connection_class, setReadTimeout);

	PHP_METHOD(amqp_connection_class, getWriteTimeout);
	PHP_METHOD(amqp_connection_class, setWriteTimeout);

	PHP_METHOD(amqp_connection_class, getUsedChannels);
	PHP_METHOD(amqp_connection_class, getMaxChannels);
	#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	PHP_METHOD(amqp_connection_class, getHeartbeatInterval);
	PHP_METHOD(amqp_connection_class, getMaxFrameSize);
	#endif
	PHP_METHOD(amqp_connection_class, isPersistent);

	+PHP_MINIT_FUNCTION(amqp_connection);
	+
	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.6.1/amqp_connection_resource.c b/amqp-1.7.0alpha1/amqp_connection_resource.c
	similarity index 86%
	rename from amqp-1.6.1/amqp_connection_resource.c
	rename to amqp-1.7.0alpha1/amqp_connection_resource.c
	index cda9c83..bc42389 100644
	--- a/amqp-1.6.1/amqp_connection_resource.c
	+++ b/amqp-1.7.0alpha1/amqp_connection_resource.c
	@@ -1,471 +1,504 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_connection.c 327551 2012-09-09 03:49:34Z pdezwart $ */

	#ifdef HAVE_CONFIG_H
	#include "config.h"
	#endif

	#include "php.h"
	#include "php_ini.h"
	#include "ext/standard/info.h"
	#include "ext/standard/datetime.h"
	#include "zend_exceptions.h"

	#ifdef PHP_WIN32
	# include "win32/php_stdint.h"
	# include "win32/signal.h"
	#else
	# include <signal.h>
	# include <stdint.h>
	#endif
	#include <amqp.h>
	#include <amqp_framing.h>
	#include <amqp_tcp_socket.h>

	#ifdef PHP_WIN32
	# include "win32/unistd.h"
	#else
	# include <unistd.h>
	#endif

	#include "php_amqp.h"
	+#include "amqp_channel.h"
	#include "amqp_connection_resource.h"

	#ifndef E_DEPRECATED
	#define E_DEPRECATED E_WARNING
	#endif

	int le_amqp_connection_resource;
	int le_amqp_connection_resource_persistent;

	static void connection_resource_destructor(amqp_connection_resource *resource, int persistent TSRMLS_DC);


	/* Figure out what's going on connection and handle protocol exceptions, if any */

	int php_amqp_connection_resource_error(amqp_rpc_reply_t reply, char *message, amqp_connection_resource resource, amqp_channel_t channel_id TSRMLS_DC)
	{
	assert (resource != NULL);

	switch (reply.reply_type) {
	case AMQP_RESPONSE_NORMAL:
	return PHP_AMQP_RESOURCE_RESPONSE_OK;

	case AMQP_RESPONSE_NONE:
	spprintf(message, 0, "Missing RPC reply type.");
	return PHP_AMQP_RESOURCE_RESPONSE_ERROR;

	case AMQP_RESPONSE_LIBRARY_EXCEPTION:
	spprintf(message, 0, "Library error: %s", amqp_error_string2(reply.library_error));
	return PHP_AMQP_RESOURCE_RESPONSE_ERROR;

	case AMQP_RESPONSE_SERVER_EXCEPTION:
	switch (reply.reply.id) {
	case AMQP_CONNECTION_CLOSE_METHOD: {
	amqp_connection_close_t m = (amqp_connection_close_t )reply.reply.decoded;

	spprintf(message, 0, "Server connection error: %d, message: %.*s",
	m->reply_code,
	- (int) m->reply_text.len,
	+ (PHP5to7_param_str_len_type_t) m->reply_text.len,
	(char *) m->reply_text.bytes
	);

	/*
	* - If r.reply.id == AMQP_CONNECTION_CLOSE_METHOD a connection exception
	* occurred, cast r.reply.decoded to amqp_connection_close_t* to see
	* details of the exception. The client amqp_send_method() a
	* amqp_connection_close_ok_t and disconnect from the broker.
	*/

	amqp_connection_close_ok_t decoded = (amqp_connection_close_ok_t ) NULL;

	amqp_send_method(
	resource->connection_state,
	0, /* NOTE: 0-channel is reserved for things like this */
	AMQP_CONNECTION_CLOSE_OK_METHOD,
	&decoded
	);

	/* Prevent finishing AMQP connection in connection resource destructor */
	resource->is_connected = '\0';

	return PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED;
	}
	case AMQP_CHANNEL_CLOSE_METHOD: {
	assert(channel_id > 0 && channel_id <= resource->max_slots);

	amqp_channel_close_t m = (amqp_channel_close_t ) reply.reply.decoded;

	spprintf(message, 0, "Server channel error: %d, message: %.*s",
	m->reply_code,
	- (int) m->reply_text.len,
	+ (PHP5to7_param_str_len_type_t) m->reply_text.len,
	(char *)m->reply_text.bytes
	);

	/*
	* - If r.reply.id == AMQP_CHANNEL_CLOSE_METHOD a channel exception
	* occurred, cast r.reply.decoded to amqp_channel_close_t* to see details
	* of the exception. The client should amqp_send_method() a
	* amqp_channel_close_ok_t. The channel must be re-opened before it
	* can be used again. Any resources associated with the channel
	* (auto-delete exchanges, auto-delete queues, consumers) are invalid
	* and must be recreated before attempting to use them again.
	*/

	amqp_channel_close_ok_t decoded = (amqp_channel_close_ok_t ) NULL;

	amqp_send_method(
	resource->connection_state,
	channel_id,
	AMQP_CHANNEL_CLOSE_OK_METHOD,
	&decoded
	);

	return PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED;
	}
	}
	/* Default for the above switch should be handled by the below default. */
	default:
	spprintf(message, 0, "Unknown server error, method id 0x%08X", reply.reply.id);
	return PHP_AMQP_RESOURCE_RESPONSE_ERROR;
	}

	/* Should not never get here*/
	}


	/* Socket-related functions */
	int php_amqp_set_resource_read_timeout(amqp_connection_resource *resource, double timeout TSRMLS_DC)
	{
	assert(timeout >= 0.0);

	#ifdef PHP_WIN32
	DWORD read_timeout;
	/*
	In Windows, setsockopt with SO_RCVTIMEO sets actual timeout
	to a value that's 500ms greater than specified value.
	Also, it's not possible to set timeout to any value below 500ms.
	Zero timeout works like it should, however.
	*/
	if (timeout == 0.) {
	read_timeout = 0;
	} else {
	read_timeout = (int) (max(connection->read_timeout * 1.e+3 - .5e+3, 1.));
	}
	#else
	struct timeval read_timeout;
	read_timeout.tv_sec = (int) floor(timeout);
	read_timeout.tv_usec = (int) ((timeout - floor(timeout)) * 1.e+6);
	#endif

	if (0 != setsockopt(amqp_get_sockfd(resource->connection_state), SOL_SOCKET, SO_RCVTIMEO, (char *)&read_timeout, sizeof(read_timeout))) {
	zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: cannot setsockopt SO_RCVTIMEO", 0 TSRMLS_CC);
	return 0;
	}

	return 1;
	}

	int php_amqp_set_resource_write_timeout(amqp_connection_resource *resource, double timeout TSRMLS_DC)
	{
	assert(timeout >= 0.0);

	#ifdef PHP_WIN32
	DWORD write_timeout;

	if (timeout == 0.) {
	write_timeout = 0;
	} else {
	write_timeout = (int) (max(timeout * 1.e+3 - .5e+3, 1.));
	}
	#else
	struct timeval write_timeout;
	write_timeout.tv_sec = (int) floor(timeout);
	write_timeout.tv_usec = (int) ((timeout - floor(timeout)) * 1.e+6);
	#endif

	if (0 != setsockopt(amqp_get_sockfd(resource->connection_state), SOL_SOCKET, SO_SNDTIMEO, (char *)&write_timeout, sizeof(write_timeout))) {
	zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: cannot setsockopt SO_SNDTIMEO", 0 TSRMLS_CC);
	return 0;
	}

	return 1;
	}


	/* Channel-related functions */

	amqp_channel_t php_amqp_connection_resource_get_available_channel_id(amqp_connection_resource *resource)
	{
	assert(resource != NULL);
	assert(resource->slots != NULL);

	/* Check if there are any open slots */
	if (resource->used_slots >= resource->max_slots) {
	return 0;
	}

	amqp_channel_t slot;

	for (slot = 0; slot < resource->max_slots; slot++) {
	if (resource->slots[slot] == 0) {
	return (amqp_channel_t) (slot + 1);
	}
	}

	return 0;
	}

	-int php_amqp_connection_resource_register_channel(amqp_connection_resource resource, amqp_channel_object channel, amqp_channel_t channel_id)
	+int php_amqp_connection_resource_register_channel(amqp_connection_resource resource, amqp_channel_resource channel_resource, amqp_channel_t channel_id)
	{
	assert(resource != NULL);
	assert(resource->slots != NULL);
	assert(channel_id > 0 && channel_id <= resource->max_slots);

	if (resource->slots[channel_id - 1] != 0) {
	return FAILURE;
	}

	- resource->slots[channel_id - 1] = channel;
	+ resource->slots[channel_id - 1] = channel_resource;
	+ channel_resource->connection_resource = resource;
	resource->used_slots++;

	return SUCCESS;
	}

	int php_amqp_connection_resource_unregister_channel(amqp_connection_resource *resource, amqp_channel_t channel_id)
	{
	assert(resource != NULL);
	assert(resource->slots != NULL);
	assert(channel_id > 0 && channel_id <= resource->max_slots);

	if (resource->slots[channel_id - 1] != 0) {
	+ resource->slots[channel_id - 1]->connection_resource = NULL;
	+
	resource->slots[channel_id - 1] = 0;
	resource->used_slots--;
	}

	return SUCCESS;
	}


	/* Creating and destroying resource */

	-amqp_connection_resource connection_resource_constructor(amqp_connection_object connection, zend_bool persistent TSRMLS_DC)
	+amqp_connection_resource connection_resource_constructor(amqp_connection_params params, zend_bool persistent TSRMLS_DC)
	{
	struct timeval tv = {0};
	struct timeval *tv_ptr = &tv;

	char *std_datetime;
	amqp_table_entry_t client_properties_entries[5];
	amqp_table_t client_properties_table;

	amqp_table_entry_t custom_properties_entries[1];
	amqp_table_t custom_properties_table;

	amqp_connection_resource *resource;

	/* Allocate space for the connection resource */
	resource = (amqp_connection_resource *)pecalloc(1, sizeof(amqp_connection_resource), persistent);

	- /* Initialize all the data */
	- resource->is_connected = 0;
	- resource->max_slots = 0;
	- resource->used_slots = 0;
	- resource->resource_id = 0;
	-
	/* Create the connection */
	resource->connection_state = amqp_new_connection();

	/* Create socket object */
	resource->socket = amqp_tcp_socket_new(resource->connection_state);

	- if (connection->connect_timeout > 0) {
	- tv.tv_sec = (long int) connection->connect_timeout;
	- tv.tv_usec = (long int) ((connection->connect_timeout - tv.tv_sec) * 1000000);
	+ if (params->connect_timeout > 0) {
	+ tv.tv_sec = (long int) params->connect_timeout;
	+ tv.tv_usec = (long int) ((params->connect_timeout - tv.tv_sec) * 1000000);
	} else {
	tv_ptr = NULL;
	}

	/* Try to connect and verify that no error occurred */
	- if (amqp_socket_open_noblock(resource->socket, connection->host, connection->port, tv_ptr)) {
	+ if (amqp_socket_open_noblock(resource->socket, params->host, params->port, tv_ptr)) {

	zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: could not connect to host.", 0 TSRMLS_CC);

	connection_resource_destructor(resource, persistent TSRMLS_CC);

	return NULL;
	}

	- if (!php_amqp_set_resource_read_timeout(resource, connection->read_timeout TSRMLS_CC)) {
	+ if (!php_amqp_set_resource_read_timeout(resource, params->read_timeout TSRMLS_CC)) {
	connection_resource_destructor(resource, persistent TSRMLS_CC);
	return NULL;
	}

	- if (!php_amqp_set_resource_write_timeout(resource, connection->write_timeout TSRMLS_CC)) {
	+ if (!php_amqp_set_resource_write_timeout(resource, params->write_timeout TSRMLS_CC)) {
	connection_resource_destructor(resource, persistent TSRMLS_CC);
	return NULL;
	}

	std_datetime = php_std_date(time(NULL) TSRMLS_CC);

	client_properties_entries[0].key = amqp_cstring_bytes("type");
	client_properties_entries[0].value.kind = AMQP_FIELD_KIND_UTF8;
	client_properties_entries[0].value.value.bytes = amqp_cstring_bytes("php-amqp extension");

	client_properties_entries[1].key = amqp_cstring_bytes("version");
	client_properties_entries[1].value.kind = AMQP_FIELD_KIND_UTF8;
	client_properties_entries[1].value.value.bytes = amqp_cstring_bytes(PHP_AMQP_VERSION);

	client_properties_entries[2].key = amqp_cstring_bytes("revision");
	client_properties_entries[2].value.kind = AMQP_FIELD_KIND_UTF8;
	client_properties_entries[2].value.value.bytes = amqp_cstring_bytes(PHP_AMQP_REVISION);

	client_properties_entries[3].key = amqp_cstring_bytes("connection type");
	client_properties_entries[3].value.kind = AMQP_FIELD_KIND_UTF8;
	client_properties_entries[3].value.value.bytes = amqp_cstring_bytes(persistent ? "persistent" : "transient");

	client_properties_entries[4].key = amqp_cstring_bytes("connection started");
	client_properties_entries[4].value.kind = AMQP_FIELD_KIND_UTF8;
	client_properties_entries[4].value.value.bytes = amqp_cstring_bytes(std_datetime);

	client_properties_table.entries = client_properties_entries;
	client_properties_table.num_entries = sizeof(client_properties_entries) / sizeof(amqp_table_entry_t);

	custom_properties_entries[0].key = amqp_cstring_bytes("client");
	custom_properties_entries[0].value.kind = AMQP_FIELD_KIND_TABLE;
	custom_properties_entries[0].value.value.table = client_properties_table;

	custom_properties_table.entries = custom_properties_entries;
	custom_properties_table.num_entries = sizeof(custom_properties_entries) / sizeof(amqp_table_entry_t);

	/* We can assume that connection established here but it is not true, real handshake goes during login */

	- assert(connection->frame_max > 0);
	+ assert(params->frame_max > 0);

	amqp_rpc_reply_t res = amqp_login_with_properties(
	resource->connection_state,
	- connection->vhost,
	- connection->channel_max,
	- connection->frame_max,
	- connection->heartbeat,
	+ params->vhost,
	+ params->channel_max,
	+ params->frame_max,
	+ params->heartbeat,
	&custom_properties_table,
	AMQP_SASL_METHOD_PLAIN,
	- connection->login,
	- connection->password
	+ params->login,
	+ params->password
	);

	efree(std_datetime);

	if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	char message, long_message;

	php_amqp_connection_resource_error(res, &message, resource, 0 TSRMLS_CC);

	spprintf(&long_message, 0, "%s - Potential login failure.", message);
	zend_throw_exception(amqp_connection_exception_class_entry, long_message, 0 TSRMLS_CC);

	efree(message);
	efree(long_message);

	/* https://www.rabbitmq.com/resources/specs/amqp0-9-1.pdf
	*
	* 2.2.4 The Connection Class:
	* ... a peer that detects an error MUST close the socket without sending any further data.
	*
	* 4.10.2 Denial of Service Attacks:
	* ... The general response to any exceptional condition in the connection negotiation is to pause that connection
	* (presumably a thread) for a period of several seconds and then to close the network connection. This
	* includes syntax errors, over-sized data, and failed attempts to authenticate.
	*/
	connection_resource_destructor(resource, persistent TSRMLS_CC);
	return NULL;
	}

	/* Allocate space for the channel slots in the ring buffer */
	resource->max_slots = (amqp_channel_t) amqp_get_channel_max(resource->connection_state);
	assert(resource->max_slots > 0);

	- resource->slots = (amqp_channel_object *)pecalloc(resource->max_slots + 1, sizeof(amqp_channel_object), persistent);
	+ resource->slots = (amqp_channel_resource *)pecalloc(resource->max_slots + 1, sizeof(amqp_channel_object), persistent);

	resource->is_connected = '\1';

	return resource;
	}

	ZEND_RSRC_DTOR_FUNC(amqp_connection_resource_dtor_persistent)
	{
	- amqp_connection_resource resource = (amqp_connection_resource )rsrc->ptr;
	+ amqp_connection_resource resource = (amqp_connection_resource )PHP5to7_ZEND_RESOURCE_DTOR_ARG->ptr;

	connection_resource_destructor(resource, 1 TSRMLS_CC);
	}

	ZEND_RSRC_DTOR_FUNC(amqp_connection_resource_dtor)
	{
	- amqp_connection_resource resource = (amqp_connection_resource )rsrc->ptr;
	+ amqp_connection_resource resource = (amqp_connection_resource )PHP5to7_ZEND_RESOURCE_DTOR_ARG->ptr;

	connection_resource_destructor(resource, 0 TSRMLS_CC);
	}

	static void connection_resource_destructor(amqp_connection_resource *resource, int persistent TSRMLS_DC)
	{
	assert(resource != NULL);

	- zend_rsrc_list_entry *le;
	#ifndef PHP_WIN32
	void * old_handler;

	/*
	If we are trying to close the connection and the connection already closed, it will throw
	SIGPIPE, which is fine, so ignore all SIGPIPES
	*/

	/* Start ignoring SIGPIPE */
	old_handler = signal(SIGPIPE, SIG_IGN);
	#endif

	+ if (resource->parent) {
	+ resource->parent->connection_resource = NULL;
	+ }
	+
	+ if (resource->slots) {
	+ php_amqp_prepare_for_disconnect(resource TSRMLS_CC);
	+
	+ pefree(resource->slots, persistent);
	+ resource->slots = NULL;
	+ }
	+
	/* connection may be closed in case of previous failure */
	if (resource->is_connected) {
	amqp_connection_close(resource->connection_state, AMQP_REPLY_SUCCESS);
	}

	amqp_destroy_connection(resource->connection_state);

	#ifndef PHP_WIN32
	/* End ignoring of SIGPIPEs */
	signal(SIGPIPE, old_handler);
	#endif

	if (resource->resource_key_len) {
	pefree(resource->resource_key, persistent);
	}

	- if (resource->slots) {
	- pefree(resource->slots, persistent);
	- resource->slots = NULL;
	- }
	-
	pefree(resource, persistent);
	}

	+void php_amqp_prepare_for_disconnect(amqp_connection_resource *resource TSRMLS_DC)
	+{
	+ if (resource == NULL) {
	+ return;
	+ }
	+
	+ if(resource->slots != NULL) {
	+ /* NOTE: when we have persistent connection we do not move channels between php requests
	+ * due to current php-amqp extension limitation in AMQPChannel where __construct == channel.open AMQP method call
	+ * and __destruct = channel.close AMQP method call
	+ */
	+
	+ /* Clean up old memory allocations which are now invalid (new connection) */
	+ amqp_channel_t slot;
	+
	+ for (slot = 0; slot < resource->max_slots; slot++) {
	+ if (resource->slots[slot] != 0) {
	+ php_amqp_close_channel(resource->slots[slot] TSRMLS_CC);
	+ }
	+ }
	+ }
	+
	+ /* If it's persistent connection do not destroy connection resource (this keep connection alive) */
	+ if (resource->is_persistent) {
	+ /* Cleanup buffers to reduce memory usage in idle mode */
	+ amqp_maybe_release_buffers(resource->connection_state);
	+ }
	+
	+ return;
	+}

	diff --git a/amqp-1.6.1/amqp_connection_resource.h b/amqp-1.7.0alpha1/amqp_connection_resource.h
	similarity index 85%
	rename from amqp-1.6.1/amqp_connection_resource.h
	rename to amqp-1.7.0alpha1/amqp_connection_resource.h
	index ccbc16e..aa9a371 100644
	--- a/amqp-1.6.1/amqp_connection_resource.h
	+++ b/amqp-1.7.0alpha1/amqp_connection_resource.h
	@@ -1,59 +1,75 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/
	#ifndef PHP_AMQP_CONNECTION_RESOURCE_H
	#define PHP_AMQP_CONNECTION_RESOURCE_H

	#define PHP_AMQP_RESOURCE_RESPONSE_OK 0
	#define PHP_AMQP_RESOURCE_RESPONSE_ERROR -1
	#define PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED -2
	#define PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED -3

	extern int le_amqp_connection_resource;
	extern int le_amqp_connection_resource_persistent;

	+void php_amqp_prepare_for_disconnect(amqp_connection_resource *resource TSRMLS_DC);
	+
	+typedef struct _amqp_connection_params {
	+ char *login;
	+ char *password;
	+ char *host;
	+ char *vhost;
	+ int port;
	+ int channel_max;
	+ int frame_max;
	+ int heartbeat;
	+ double read_timeout;
	+ double write_timeout;
	+ double connect_timeout;
	+} amqp_connection_params;
	+
	/* Figure out what's going on connection and handle protocol exceptions, if any */
	int php_amqp_connection_resource_error(amqp_rpc_reply_t reply, char *message, amqp_connection_resource resource, amqp_channel_t channel_id TSRMLS_DC);

	/* Socket-related functions */
	int php_amqp_set_resource_read_timeout(amqp_connection_resource *resource, double read_timeout TSRMLS_DC);
	int php_amqp_set_resource_write_timeout(amqp_connection_resource *resource, double write_timeout TSRMLS_DC);

	/* Channel-related functions */
	amqp_channel_t php_amqp_connection_resource_get_available_channel_id(amqp_connection_resource *resource);
	int php_amqp_connection_resource_unregister_channel(amqp_connection_resource *resource, amqp_channel_t channel_id);
	-int php_amqp_connection_resource_register_channel(amqp_connection_resource resource, amqp_channel_object channel, amqp_channel_t channel_id);
	+int php_amqp_connection_resource_register_channel(amqp_connection_resource resource, amqp_channel_resource channel_resource, amqp_channel_t channel_id);

	/* Creating and destroying resource */
	-amqp_connection_resource connection_resource_constructor(amqp_connection_object connection, zend_bool persistent TSRMLS_DC);
	+amqp_connection_resource connection_resource_constructor(amqp_connection_params params, zend_bool persistent TSRMLS_DC);
	ZEND_RSRC_DTOR_FUNC(amqp_connection_resource_dtor_persistent);
	ZEND_RSRC_DTOR_FUNC(amqp_connection_resource_dtor);

	#endif
	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/amqp_envelope.c b/amqp-1.7.0alpha1/amqp_envelope.c
	new file mode 100644
	index 0000000..e6ea490
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp_envelope.c
	@@ -0,0 +1,668 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+/* $Id: amqp_envelope.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+
	+# include <signal.h>
	+# include <stdint.h>
	+
	+#endif
	+
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+
	+# include <unistd.h>
	+
	+#endif
	+
	+#include "php_amqp.h"
	+#include "amqp_envelope.h"
	+
	+zend_class_entry *amqp_envelope_class_entry;
	+#define this_ce amqp_envelope_class_entry
	+
	+void parse_amqp_table(amqp_table_t table, zval result);
	+
	+void convert_amqp_envelope_to_zval(amqp_envelope_t amqp_envelope, zval envelope TSRMLS_DC)
	+{
	+ PHP5to7_zval_t headers PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ /* Build the envelope */
	+ object_init_ex(envelope, this_ce);
	+
	+ PHP5to7_MAYBE_INIT(headers);
	+ PHP5to7_ARRAY_INIT(headers);
	+
	+ amqp_basic_properties_t *p = &amqp_envelope->message.properties;
	+ amqp_message_t *message = &amqp_envelope->message;
	+
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("body"), (const char *) message->body.bytes, (PHP5to7_param_str_len_type_t) message->body.len TSRMLS_CC);
	+
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("delivery_tag"), (PHP5to7_param_long_type_t) amqp_envelope->delivery_tag TSRMLS_CC);
	+ zend_update_property_bool(this_ce, envelope, ZEND_STRL("is_redelivery"), (PHP5to7_param_long_type_t) amqp_envelope->redelivered TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("exchange_name"), (const char *) amqp_envelope->exchange.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->exchange.len TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("routing_key"), (const char *) amqp_envelope->routing_key.bytes, (PHP5to7_param_str_len_type_t) amqp_envelope->routing_key.len TSRMLS_CC);
	+
	+
	+
	+ if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("content_type"), (const char *) p->content_type.bytes, (PHP5to7_param_str_len_type_t) p->content_type.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("content_type"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_CONTENT_ENCODING_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("content_encoding"), (const char *) p->content_encoding.bytes, (PHP5to7_param_str_len_type_t) p->content_encoding.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_HEADERS_FLAG) {
	+ parse_amqp_table(&(p->headers), PHP5to7_MAYBE_PTR(headers));
	+ }
	+
	+ zend_update_property(this_ce, envelope, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
	+
	+ if (p->_flags & AMQP_BASIC_DELIVERY_MODE_FLAG) {
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_PRIORITY_FLAG) {
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("priority"), 0 TSRMLS_CC);
	+ }
	+
	+
	+ if (p->_flags & AMQP_BASIC_CORRELATION_ID_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("correlation_id"), (const char *) p->correlation_id.bytes, (PHP5to7_param_str_len_type_t) p->correlation_id.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_REPLY_TO_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("reply_to"), (const char *) p->reply_to.bytes, (PHP5to7_param_str_len_type_t) p->reply_to.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("reply_to"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_EXPIRATION_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("expiration"), (const char *) p->expiration.bytes, (PHP5to7_param_str_len_type_t) p->expiration.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("expiration"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_MESSAGE_ID_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("message_id"), (const char *) p->message_id.bytes, (PHP5to7_param_str_len_type_t) p->message_id.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("message_id"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_TIMESTAMP_FLAG) {
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_long(this_ce, envelope, ZEND_STRL("timestamp"), 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_TYPE_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("type"), (const char *) p->type.bytes, (PHP5to7_param_str_len_type_t) p->type.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("type"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_USER_ID_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("user_id"), (const char *) p->user_id.bytes, (PHP5to7_param_str_len_type_t) p->user_id.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("user_id"), "", 0 TSRMLS_CC);
	+ }
	+
	+ if (p->_flags & AMQP_BASIC_APP_ID_FLAG) {
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("app_id"), (const char *) p->app_id.bytes, (PHP5to7_param_str_len_type_t) p->app_id.len TSRMLS_CC);
	+ } else {
	+ /* BC */
	+ zend_update_property_stringl(this_ce, envelope, ZEND_STRL("app_id"), "", 0 TSRMLS_CC);
	+ }
	+
	+ PHP5to7_MAYBE_DESTROY(headers);
	+}
	+
	+
	+/* {{{ proto AMQPEnvelope::__construct() */
	+PHP_METHOD (amqp_envelope_class, __construct) {
	+ PHP_AMQP_NOPARAMS();
	+
	+ /* BC */
	+ PHP5to7_zval_t headers PHP5to7_MAYBE_SET_TO_NULL;
	+ PHP5to7_MAYBE_INIT(headers);
	+ PHP5to7_ARRAY_INIT(headers);
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("body"), "", 0 TSRMLS_CC);
	+
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("delivery_tag"), 0 TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("is_redelivery"), 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("exchange_name"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("routing_key"), "", 0 TSRMLS_CC);
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_type"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC);
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("priority"), 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("reply_to"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("expiration"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("message_id"), "", 0 TSRMLS_CC);
	+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("timestamp"), 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("user_id"), "", 0 TSRMLS_CC);
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("app_id"), "", 0 TSRMLS_CC);
	+
	+ PHP5to7_MAYBE_DESTROY(headers);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPEnvelope::getBody()*/
	+PHP_METHOD (amqp_envelope_class, getBody) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ zval* zv = PHP_AMQP_READ_THIS_PROP("body");
	+
	+ if (Z_STRLEN_P(zv) == 0) {
	+ /* BC */
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_ZVAL(zv, 1, 0);
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getRoutingKey() */
	+PHP_METHOD (amqp_envelope_class, getRoutingKey) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("routing_key");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getDeliveryMode() */
	+PHP_METHOD (amqp_envelope_class, getDeliveryMode) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("delivery_mode");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPEnvelope::getDeliveryTag() */
	+PHP_METHOD (amqp_envelope_class, getDeliveryTag) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("delivery_tag");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getExchangeName() */
	+PHP_METHOD (amqp_envelope_class, getExchangeName) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("exchange_name");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::isRedelivery() */
	+PHP_METHOD (amqp_envelope_class, isRedelivery) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("is_redelivery");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getContentType() */
	+PHP_METHOD (amqp_envelope_class, getContentType) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("content_type");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getContentEncoding() */
	+PHP_METHOD (amqp_envelope_class, getContentEncoding) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("content_encoding");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getType() */
	+PHP_METHOD (amqp_envelope_class, getType) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("type");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getTimestamp() */
	+PHP_METHOD (amqp_envelope_class, getTimestamp) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("timestamp");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getPriority() */
	+PHP_METHOD (amqp_envelope_class, getPriority) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("priority");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getExpiration()
	+check amqp envelope */
	+PHP_METHOD (amqp_envelope_class, getExpiration) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("expiration");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getUserId() */
	+PHP_METHOD (amqp_envelope_class, getUserId) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("user_id");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getAppId() */
	+PHP_METHOD (amqp_envelope_class, getAppId) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("app_id");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getMessageId() */
	+PHP_METHOD (amqp_envelope_class, getMessageId) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("message_id");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getReplyTo() */
	+PHP_METHOD (amqp_envelope_class, getReplyTo) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("reply_to");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getCorrelationId() */
	+PHP_METHOD (amqp_envelope_class, getCorrelationId) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("correlation_id");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPEnvelope::getHeader(string name) */
	+PHP_METHOD (amqp_envelope_class, getHeader) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ zval* zv = PHP_AMQP_READ_THIS_PROP("headers");
	+
	+ /* Look for the hash key */
	+ if (!PHP5to7_ZEND_HASH_FIND(HASH_OF(zv), key, key_len + 1, tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_ZVAL(PHP5to7_MAYBE_DEREF(tmp), 1, 0);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPEnvelope::hasHeader(string name) */
	+PHP_METHOD (amqp_envelope_class, hasHeader) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ zval* zv = PHP_AMQP_READ_THIS_PROP("headers");
	+
	+ /* Look for the hash key */
	+ if (!PHP5to7_ZEND_HASH_FIND(HASH_OF(zv), key, key_len + 1, tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPEnvelope::getHeaders() */
	+PHP_METHOD (amqp_envelope_class, getHeaders) {
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("headers");
	+}
	+/* }}} */
	+
	+/* amqp_envelope_class ARG_INFO definition */
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getBody, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getRoutingKey, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryTag, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getDeliveryMode, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExchangeName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_isRedelivery, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getContentEncoding, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getPriority, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getExpiration, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getUserId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getAppId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getMessageId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getReplyTo, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getCorrelationId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeaders, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_getHeader, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, name)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_envelope_class_hasHeader, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, name)
	+ZEND_END_ARG_INFO()
	+
	+zend_function_entry amqp_envelope_class_functions[] = {
	+ PHP_ME(amqp_envelope_class, __construct, arginfo_amqp_envelope_class__construct, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getBody, arginfo_amqp_envelope_class_getBody, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getRoutingKey, arginfo_amqp_envelope_class_getRoutingKey, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getDeliveryTag, arginfo_amqp_envelope_class_getDeliveryTag, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getDeliveryMode, arginfo_amqp_envelope_class_getDeliveryMode, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getExchangeName, arginfo_amqp_envelope_class_getExchangeName, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, isRedelivery, arginfo_amqp_envelope_class_isRedelivery, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getContentType, arginfo_amqp_envelope_class_getContentType, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getContentEncoding, arginfo_amqp_envelope_class_getContentEncoding, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getType, arginfo_amqp_envelope_class_getType, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getTimestamp, arginfo_amqp_envelope_class_getTimestamp, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getPriority, arginfo_amqp_envelope_class_getPriority, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getExpiration, arginfo_amqp_envelope_class_getExpiration, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getUserId, arginfo_amqp_envelope_class_getUserId, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getAppId, arginfo_amqp_envelope_class_getAppId, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getMessageId, arginfo_amqp_envelope_class_getMessageId, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getReplyTo, arginfo_amqp_envelope_class_getReplyTo, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getCorrelationId, arginfo_amqp_envelope_class_getCorrelationId, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getHeaders, arginfo_amqp_envelope_class_getHeaders, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, getHeader, arginfo_amqp_envelope_class_getHeader, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_envelope_class, hasHeader, arginfo_amqp_envelope_class_hasHeader, ZEND_ACC_PUBLIC)
	+
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+
	+
	+PHP_MINIT_FUNCTION (amqp_envelope) {
	+ zend_class_entry ce;
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPEnvelope", amqp_envelope_class_functions);
	+ this_ce = zend_register_internal_class(&ce TSRMLS_CC);
	+
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("body"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ /*
	+ deliver(consumer-tag consumer-tag,
	+ delivery-tag delivery-tag,
	+ redelivered redelivered,
	+ exchange-name exchange,
	+ shortstr routing-key)
	+
	+ get-ok(delivery-tag delivery-tag,
	+ redelivered redelivered,
	+ exchange-name exchange,
	+ shortstr routing-key,
	+ message-count message-count)
	+ */
	+ zend_declare_property_null(this_ce, ZEND_STRL("delivery_tag"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("is_redelivery"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("exchange_name"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("routing_key"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ /*
	+ shortstr content-type MIME content type.
	+ shortstr content-encoding MIME content encoding.
	+ table headers Message header field table.
	+ octet delivery-mode Non-persistent (1) or persistent (2).
	+ octet priority Message priority, 0 to 9.
	+ shortstr correlation-id Application correlation identifier.
	+ shortstr reply-to Address to reply to.
	+ shortstr expiration Message expiration specification.
	+ shortstr message-id Application message identifier.
	+ timestamp timestamp Message timestamp.
	+ shortstr type Message type name.
	+ shortstr user-id Creating user id.
	+ shortstr app-id Creating application id.
	+ */
	+ zend_declare_property_null(this_ce, ZEND_STRL("content_type"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("content_encoding"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("headers"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("delivery_mode"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("priority"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("correlation_id"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("reply_to"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("expiration"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("message_id"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("timestamp"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("type"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("user_id"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("app_id"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ return SUCCESS;
	+}
	+
	+
	+void parse_amqp_table(amqp_table_t table, zval result) {
	+ int i;
	+ PHP5to7_zval_t value PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ assert(Z_TYPE_P(result) == IS_ARRAY);
	+
	+ for (i = 0; i < table->num_entries; i++) {
	+ PHP5to7_MAYBE_INIT(value);
	+
	+ amqp_table_entry_t *entry = &(table->entries[i]);
	+ switch (entry->value.kind) {
	+ case AMQP_FIELD_KIND_BOOLEAN:
	+ ZVAL_BOOL(PHP5to7_MAYBE_PTR(value), entry->value.value.boolean);
	+ break;
	+ case AMQP_FIELD_KIND_I8: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.i8);
	+ break;
	+ case AMQP_FIELD_KIND_U8: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.u8);
	+ break;
	+ case AMQP_FIELD_KIND_I16: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.i16);
	+ break;
	+ case AMQP_FIELD_KIND_U16: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.u16);
	+ break;
	+ case AMQP_FIELD_KIND_I32: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.i32);
	+ break;
	+ case AMQP_FIELD_KIND_U32: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.u32);
	+ break;
	+ case AMQP_FIELD_KIND_I64: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.i64);
	+ break;
	+ case AMQP_FIELD_KIND_U64: ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.i64);
	+ break;
	+ case AMQP_FIELD_KIND_F32: ZVAL_DOUBLE(PHP5to7_MAYBE_PTR(value), entry->value.value.f32);
	+ break;
	+ case AMQP_FIELD_KIND_F64: ZVAL_DOUBLE(PHP5to7_MAYBE_PTR(value), entry->value.value.f64);
	+ break;
	+ case AMQP_FIELD_KIND_UTF8:
	+ case AMQP_FIELD_KIND_BYTES:
	+ PHP5to7_ZVAL_STRINGL_DUP(PHP5to7_MAYBE_PTR(value), entry->value.value.bytes.bytes, entry->value.value.bytes.len);
	+ break;
	+ case AMQP_FIELD_KIND_ARRAY: {
	+ int j;
	+ array_init(PHP5to7_MAYBE_PTR(value));
	+ for (j = 0; j < entry->value.value.array.num_entries; ++j) {
	+ switch (entry->value.value.array.entries[j].kind) {
	+ case AMQP_FIELD_KIND_UTF8:
	+ PHP5to7_ADD_NEXT_INDEX_STRINGL_DUP(
	+ PHP5to7_MAYBE_PTR(value),
	+ entry->value.value.array.entries[j].value.bytes.bytes,
	+ (uint) entry->value.value.array.entries[j].value.bytes.len
	+ );
	+ break;
	+ case AMQP_FIELD_KIND_TABLE: {
	+ PHP5to7_zval_t subtable PHP5to7_MAYBE_SET_TO_NULL;
	+ PHP5to7_MAYBE_INIT(subtable);
	+ PHP5to7_ARRAY_INIT(subtable);
	+
	+ parse_amqp_table(
	+ &(entry->value.value.array.entries[j].value.table),
	+ PHP5to7_MAYBE_PTR(subtable)
	+ );
	+ add_next_index_zval(PHP5to7_MAYBE_PTR(value), PHP5to7_MAYBE_PTR(subtable));
	+ }
	+ break;
	+ default:
	+ break;
	+ }
	+ }
	+ }
	+ break;
	+ case AMQP_FIELD_KIND_TABLE:
	+ PHP5to7_ARRAY_INIT(value);
	+ parse_amqp_table(&(entry->value.value.table), PHP5to7_MAYBE_PTR(value));
	+ break;
	+ case AMQP_FIELD_KIND_TIMESTAMP: ZVAL_DOUBLE(PHP5to7_MAYBE_PTR(value), entry->value.value.u64);
	+ break;
	+ case AMQP_FIELD_KIND_VOID:
	+ case AMQP_FIELD_KIND_DECIMAL:
	+ default: ZVAL_NULL(PHP5to7_MAYBE_PTR(value));
	+ break;
	+ }
	+
	+ if (Z_TYPE_P(PHP5to7_MAYBE_PTR(value)) != IS_NULL) {
	+ char *key = estrndup(entry->key.bytes, (uint) entry->key.len);
	+ add_assoc_zval(result, key, PHP5to7_MAYBE_PTR(value));
	+ efree(key);
	+ } else {
	+ PHP5to7_MAYBE_DESTROY(value);
	+ }
	+ }
	+ return;
	+}
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.6.1/amqp_envelope.h b/amqp-1.7.0alpha1/amqp_envelope.h
	similarity index 92%
	rename from amqp-1.6.1/amqp_envelope.h
	rename to amqp-1.7.0alpha1/amqp_envelope.h
	index 9eaa40f..c930b9a 100644
	--- a/amqp-1.6.1/amqp_envelope.h
	+++ b/amqp-1.7.0alpha1/amqp_envelope.h
	@@ -1,60 +1,62 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_envelope.h 321054 2011-12-16 01:23:28Z pdezwart $ */

	+extern zend_class_entry *amqp_envelope_class_entry;

	-void amqp_envelope_dtor(void *object TSRMLS_DC);
	-zend_object_value amqp_envelope_ctor(zend_class_entry *ce TSRMLS_DC);
	+void convert_amqp_envelope_to_zval(amqp_envelope_t amqp_envelope, zval envelope TSRMLS_DC);

	PHP_METHOD(amqp_envelope_class, __construct);
	PHP_METHOD(amqp_envelope_class, getBody);
	PHP_METHOD(amqp_envelope_class, getRoutingKey);
	PHP_METHOD(amqp_envelope_class, getDeliveryTag);
	PHP_METHOD(amqp_envelope_class, getDeliveryMode);
	PHP_METHOD(amqp_envelope_class, getExchangeName);
	PHP_METHOD(amqp_envelope_class, isRedelivery);
	PHP_METHOD(amqp_envelope_class, getContentType);
	PHP_METHOD(amqp_envelope_class, getContentEncoding);
	PHP_METHOD(amqp_envelope_class, getType);
	PHP_METHOD(amqp_envelope_class, getTimestamp);
	PHP_METHOD(amqp_envelope_class, getPriority);
	PHP_METHOD(amqp_envelope_class, getExpiration);
	PHP_METHOD(amqp_envelope_class, getUserId);
	PHP_METHOD(amqp_envelope_class, getAppId);
	PHP_METHOD(amqp_envelope_class, getMessageId);
	PHP_METHOD(amqp_envelope_class, getReplyTo);
	PHP_METHOD(amqp_envelope_class, getCorrelationId);
	PHP_METHOD(amqp_envelope_class, getHeaders);
	PHP_METHOD(amqp_envelope_class, getHeader);
	+PHP_METHOD(amqp_envelope_class, hasHeader);

	+PHP_MINIT_FUNCTION(amqp_envelope);


	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/amqp_exchange.c b/amqp-1.7.0alpha1/amqp_exchange.c
	new file mode 100644
	index 0000000..1dd36fb
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp_exchange.c
	@@ -0,0 +1,950 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+/* $Id: amqp_exchange.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+# include <signal.h>
	+# include <stdint.h>
	+#endif
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+# include <unistd.h>
	+#endif
	+
	+#include "php_amqp.h"
	+#include "amqp_connection.h"
	+#include "amqp_channel.h"
	+#include "amqp_exchange.h"
	+
	+zend_class_entry *amqp_exchange_class_entry;
	+#define this_ce amqp_exchange_class_entry
	+
	+/* {{{ proto AMQPExchange::__construct(AMQPChannel channel);
	+create Exchange */
	+PHP_METHOD(amqp_exchange_class, __construct)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t arguments PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ zval *channelObj;
	+ amqp_channel_resource *channel_resource;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) {
	+ return;
	+ }
	+
	+ PHP5to7_MAYBE_INIT(arguments);
	+ PHP5to7_ARRAY_INIT(arguments);
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
	+ PHP5to7_MAYBE_DESTROY(arguments);
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj);
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create exchange.");
	+
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC);
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::getName()
	+Get the exchange name */
	+PHP_METHOD(amqp_exchange_class, getName)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ if (PHP_AMQP_READ_THIS_PROP_STRLEN("name") > 0) {
	+ PHP_AMQP_RETURN_THIS_PROP("name");
	+ } else {
	+ /* BC */
	+ RETURN_FALSE;
	+ }
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::setName(string name)
	+Set the exchange name */
	+PHP_METHOD(amqp_exchange_class, setName)
	+{
	+ char *name = NULL;
	+ PHP5to7_param_str_len_type_t name_len = 0;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Verify that the name is not null and not an empty string */
	+ if (name_len > 255) {
	+ zend_throw_exception(amqp_exchange_exception_class_entry, "Invalid exchange name given, must be less than 255 characters long.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Set the exchange name */
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::getFlags()
	+Get the exchange parameters */
	+PHP_METHOD(amqp_exchange_class, getFlags)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_param_long_type_t flagBitmask = 0;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("passive")) {
	+ flagBitmask \|= AMQP_PASSIVE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("durable")) {
	+ flagBitmask \|= AMQP_DURABLE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("auto_delete")) {
	+ flagBitmask \|= AMQP_AUTODELETE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("internal")) {
	+ flagBitmask \|= AMQP_INTERNAL;
	+ }
	+
	+ RETURN_LONG(flagBitmask);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::setFlags(long bitmask)
	+Set the exchange parameters */
	+PHP_METHOD(amqp_exchange_class, setFlags)
	+{
	+ PHP5to7_param_long_type_t flagBitmask;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flagBitmask) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Set the flags based on the bitmask we were given */
	+ flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_EXCHANGE_FLAGS : flagBitmask;
	+
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("internal"), IS_INTERNAL(flagBitmask) TSRMLS_CC);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::getType()
	+Get the exchange type */
	+PHP_METHOD(amqp_exchange_class, getType)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ if (PHP_AMQP_READ_THIS_PROP_STRLEN("type") > 0) {
	+ PHP_AMQP_RETURN_THIS_PROP("type");
	+ } else {
	+ /* BC */
	+ RETURN_FALSE;
	+ }
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::setType(string type)
	+Set the exchange type */
	+PHP_METHOD(amqp_exchange_class, setType)
	+{
	+ char *type = NULL; PHP5to7_param_str_len_type_t type_len = 0;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &type, &type_len) == FAILURE) {
	+ return;
	+ }
	+
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::getArgument(string key)
	+Get the exchange argument referenced by key */
	+PHP_METHOD(amqp_exchange_class, getArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, key_len + 1, tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_ZVAL(PHP5to7_MAYBE_DEREF(tmp), 1, 0);
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPExchange::hasArgument(string key) */
	+PHP_METHOD(amqp_exchange_class, hasArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint)(key_len + 1), tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPExchange::getArguments
	+Get the exchange arguments */
	+PHP_METHOD(amqp_exchange_class, getArguments)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("arguments");
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::setArguments(array args)
	+Overwrite all exchange arguments with given args */
	+PHP_METHOD(amqp_exchange_class, setArguments)
	+{
	+ zval *zvalArguments;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::setArgument(key, value) */
	+PHP_METHOD(amqp_exchange_class, setArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ char *key= NULL; PHP5to7_param_str_len_type_t key_len = 0;
	+ zval *value = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz",
	+ &key, &key_len,
	+ &value) == FAILURE) {
	+ return;
	+ }
	+
	+ switch (Z_TYPE_P(value)) {
	+ case IS_NULL:
	+ PHP5to7_ZEND_HASH_DEL(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint) (key_len + 1));
	+ break;
	+ PHP5to7_CASE_IS_BOOL:
	+ case IS_LONG:
	+ case IS_DOUBLE:
	+ case IS_STRING:
	+ PHP5to7_ZEND_HASH_ADD(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint) (key_len + 1), value, sizeof(zval *));
	+ Z_TRY_ADDREF_P(value);
	+ break;
	+ default:
	+ zend_throw_exception(amqp_exchange_exception_class_entry, "The value parameter must be of type NULL, int, double or string.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::declareExchange();
	+declare Exchange
	+*/
	+PHP_METHOD(amqp_exchange_class, declareExchange)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+ amqp_table_t *arguments;
	+
	+ if (zend_parse_parameters_none() == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not declare exchange.");
	+
	+ /* Check that the exchange has a name */
	+ if (PHP_AMQP_READ_THIS_PROP_STRLEN("name") < 1) {
	+ zend_throw_exception(amqp_exchange_exception_class_entry, "Could not declare exchange. Exchanges must have a name.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Check that the exchange has a name */
	+ if (PHP_AMQP_READ_THIS_PROP_STRLEN("type") < 1) {
	+ zend_throw_exception(amqp_exchange_exception_class_entry, "Could not declare exchange. Exchanges must have a type.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ arguments = convert_zval_to_amqp_table(PHP_AMQP_READ_THIS_PROP("arguments") TSRMLS_CC);
	+
	+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
	+ amqp_exchange_declare(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("type")),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("passive"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("durable"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("auto_delete"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("internal"),
	+ *arguments
	+ );
	+#else
	+ amqp_exchange_declare(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("type")),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("passive"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("durable"),
	+ *arguments
	+ );
	+#endif
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ php_amqp_free_amqp_table(arguments);
	+
	+ /* handle any errors that occured outside of signals */
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::delete([string name[, long params]]);
	+delete Exchange
	+*/
	+PHP_METHOD(amqp_exchange_class, delete)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *name = NULL; PHP5to7_param_str_len_type_t name_len = 0;
	+ PHP5to7_param_long_type_t flags = 0;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|sl",
	+ &name, &name_len,
	+ &flags) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not delete exchange.");
	+
	+ amqp_exchange_delete(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(name_len ? name : PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (AMQP_IFUNUSED & flags) ? 1 : 0
	+ );
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPExchange::publish(string msg, [string key, [int flags, [array headers]]]);
	+publish into Exchange
	+*/
	+PHP_METHOD(amqp_exchange_class, publish)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *ini_arr = NULL;
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *key_name = NULL; PHP5to7_param_str_len_type_t key_len = 0;
	+ char *msg = NULL; PHP5to7_param_str_len_type_t msg_len = 0;
	+ PHP5to7_param_long_type_t flags = AMQP_NOPARAM;
	+
	+#ifndef PHP_WIN32
	+ /* Storage for previous signal handler during SIGPIPE override */
	+ void * old_handler;
	+#endif
	+
	+ amqp_basic_properties_t props;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|sla/",
	+ &msg, &msg_len,
	+ &key_name, &key_len,
	+ &flags,
	+ &ini_arr) == FAILURE) {
	+ return;
	+ }
	+
	+ /* By default (and for BC) content type is text/plain (may be skipped at all, then set props._flags to 0) */
	+ props.content_type = amqp_cstring_bytes("text/plain");
	+ props._flags = AMQP_BASIC_CONTENT_TYPE_FLAG;
	+
	+ props.headers.entries = 0;
	+
	+ {
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "content_type", sizeof("content_type"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.content_type = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_CONTENT_TYPE_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "content_encoding", sizeof("content_encoding"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.content_encoding = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_CONTENT_ENCODING_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "message_id", sizeof("message_id"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.message_id = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_MESSAGE_ID_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "user_id", sizeof("user_id"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.user_id = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_USER_ID_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "app_id", sizeof("app_id"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.app_id = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_APP_ID_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "delivery_mode", sizeof("delivery_mode"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_long(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ props.delivery_mode = (uint8_t)Z_LVAL_P(PHP5to7_MAYBE_DEREF(tmp));
	+ props._flags \|= AMQP_BASIC_DELIVERY_MODE_FLAG;
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "priority", sizeof("priority"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_long(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ props.priority = (uint8_t)Z_LVAL_P(PHP5to7_MAYBE_DEREF(tmp));
	+ props._flags \|= AMQP_BASIC_PRIORITY_FLAG;
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "timestamp", sizeof("timestamp"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_long(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ props.timestamp = (uint64_t)Z_LVAL_P(PHP5to7_MAYBE_DEREF(tmp));
	+ props._flags \|= AMQP_BASIC_TIMESTAMP_FLAG;
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "expiration", sizeof("expiration"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.expiration = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_EXPIRATION_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "type", sizeof("type"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.type = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_TYPE_FLAG;
	+ }
	+ }
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "reply_to", sizeof("reply_to"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.reply_to = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_REPLY_TO_FLAG;
	+ }
	+ }
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF (ini_arr), "correlation_id", sizeof("correlation_id"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_string(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ if (Z_STRLEN_P(PHP5to7_MAYBE_DEREF(tmp)) > 0) {
	+ props.correlation_id = amqp_cstring_bytes(Z_STRVAL_P(PHP5to7_MAYBE_DEREF(tmp)));
	+ props._flags \|= AMQP_BASIC_CORRELATION_ID_FLAG;
	+ }
	+ }
	+
	+ }
	+
	+ amqp_table_t *headers = NULL;
	+
	+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "headers", sizeof("headers"), tmp)) {
	+ SEPARATE_ZVAL(tmp);
	+ convert_to_array(PHP5to7_MAYBE_DEREF(tmp));
	+
	+ headers = convert_zval_to_amqp_table(PHP5to7_MAYBE_DEREF(tmp) TSRMLS_CC);
	+
	+ props._flags \|= AMQP_BASIC_HEADERS_FLAG;
	+ props.headers = *headers;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not publish to exchange.");
	+
	+#ifndef PHP_WIN32
	+ /* Start ignoring SIGPIPE */
	+ old_handler = signal(SIGPIPE, SIG_IGN);
	+#endif
	+
	+ zval *exchange_name = PHP_AMQP_READ_THIS_PROP("name");
	+
	+ /* NOTE: basic.publish is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	+ int status = amqp_basic_publish(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (Z_TYPE_P(exchange_name) == IS_STRING && Z_STRLEN_P(exchange_name) > 0 ? amqp_cstring_bytes(Z_STRVAL_P(exchange_name)) : amqp_empty_bytes), /* exchange */
	+ (key_len > 0 ? amqp_cstring_bytes(key_name) : amqp_empty_bytes), /* routing key */
	+ (AMQP_MANDATORY & flags) ? 1 : 0, /* mandatory */
	+ (AMQP_IMMEDIATE & flags) ? 1 : 0, /* immediate */
	+ &props,
	+ php_amqp_long_string(msg, msg_len) /* message body */
	+ );
	+
	+ if (headers) {
	+ php_amqp_free_amqp_table(headers);
	+ }
	+
	+#ifndef PHP_WIN32
	+ /* End ignoring of SIGPIPEs */
	+ signal(SIGPIPE, old_handler);
	+#endif
	+
	+ if (status != AMQP_STATUS_OK) {
	+ /* Emulate library error */
	+ amqp_rpc_reply_t res;
	+ res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	+ res.library_error = status;
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int exchange::bind(string srcExchangeName[, string routingKey, array arguments]);
	+bind exchange to exchange by routing key
	+*/
	+PHP_METHOD(amqp_exchange_class, bind)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *zvalArguments = NULL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *src_name; PHP5to7_param_str_len_type_t src_name_len = 0;
	+ char *keyname; PHP5to7_param_str_len_type_t keyname_len = 0;
	+
	+ amqp_table_t *arguments = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|sa",
	+ &src_name, &src_name_len,
	+ &keyname, &keyname_len,
	+ &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not bind to exchange.");
	+
	+ if (zvalArguments) {
	+ arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	+ }
	+
	+ amqp_exchange_bind(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (src_name_len > 0 ? amqp_cstring_bytes(src_name) : amqp_empty_bytes),
	+ (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	+ (arguments ? *arguments : amqp_empty_table)
	+ );
	+
	+ if (arguments) {
	+ php_amqp_free_amqp_table(arguments);
	+ }
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto int exchange::unbind(string srcExchangeName[, string routingKey, array arguments]);
	+remove exchange to exchange binding by routing key
	+*/
	+PHP_METHOD(amqp_exchange_class, unbind)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *zvalArguments = NULL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *src_name; PHP5to7_param_str_len_type_t src_name_len = 0;
	+ char *keyname; PHP5to7_param_str_len_type_t keyname_len = 0;
	+
	+ amqp_table_t *arguments = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|sa",
	+ &src_name, &src_name_len,
	+ &keyname, &keyname_len,
	+ &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not unbind from exchange.");
	+
	+ if (zvalArguments) {
	+ arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	+ }
	+
	+ amqp_exchange_unbind(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (src_name_len > 0 ? amqp_cstring_bytes(src_name) : amqp_empty_bytes),
	+ (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	+ (arguments ? *arguments : amqp_empty_table)
	+ );
	+
	+ if (arguments) {
	+ php_amqp_free_amqp_table(arguments);
	+ }
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPExchange::getChannel()
	+Get the AMQPChannel object in use */
	+PHP_METHOD(amqp_exchange_class, getChannel)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("channel");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPExchange::getConnection()
	+Get the AMQPConnection object in use */
	+PHP_METHOD(amqp_exchange_class, getConnection)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("connection");
	+}
	+/* }}} */
	+
	+/* amqp_exchange ARG_INFO definition */
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_OBJ_INFO(0, amqp_channel, AMQPChannel, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, exchange_type)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, argument)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_hasArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, argument)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	+ ZEND_ARG_INFO(0, key)
	+ ZEND_ARG_INFO(0, value)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_setArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_ARRAY_INFO(0, arguments, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_declareExchange, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_bind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ ZEND_ARG_INFO(0, routing_key)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_unbind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ ZEND_ARG_INFO(0, routing_key)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_delete, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_publish, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, message)
	+ ZEND_ARG_INFO(0, routing_key)
	+ ZEND_ARG_INFO(0, flags)
	+ ZEND_ARG_ARRAY_INFO(0, headers, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getChannel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_exchange_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+zend_function_entry amqp_exchange_class_functions[] = {
	+ PHP_ME(amqp_exchange_class, __construct, arginfo_amqp_exchange_class__construct, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, getName, arginfo_amqp_exchange_class_getName, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, setName, arginfo_amqp_exchange_class_setName, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, getFlags, arginfo_amqp_exchange_class_getFlags, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, setFlags, arginfo_amqp_exchange_class_setFlags, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, getType, arginfo_amqp_exchange_class_getType, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, setType, arginfo_amqp_exchange_class_setType, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, getArgument, arginfo_amqp_exchange_class_getArgument, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, getArguments, arginfo_amqp_exchange_class_getArguments, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, setArgument, arginfo_amqp_exchange_class_setArgument, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, setArguments, arginfo_amqp_exchange_class_setArguments, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, hasArgument, arginfo_amqp_exchange_class_hasArgument, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, declareExchange,arginfo_amqp_exchange_class_declareExchange,ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, bind, arginfo_amqp_exchange_class_bind, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, unbind, arginfo_amqp_exchange_class_unbind, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, delete, arginfo_amqp_exchange_class_delete, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, publish, arginfo_amqp_exchange_class_publish, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_exchange_class, getChannel, arginfo_amqp_exchange_class_getChannel, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_exchange_class, getConnection, arginfo_amqp_exchange_class_getConnection, ZEND_ACC_PUBLIC)
	+
	+ PHP_MALIAS(amqp_exchange_class, declare, declareExchange, arginfo_amqp_exchange_class_declareExchange, ZEND_ACC_PUBLIC \| ZEND_ACC_DEPRECATED)
	+
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+
	+PHP_MINIT_FUNCTION(amqp_exchange)
	+{
	+ zend_class_entry ce;
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPExchange", amqp_exchange_class_functions);
	+ this_ce = zend_register_internal_class(&ce TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("connection"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("channel"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("name"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("type"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("passive"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("durable"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("auto_delete"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("internal"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("arguments"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ return SUCCESS;
	+}
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.6.1/amqp_exchange.h b/amqp-1.7.0alpha1/amqp_exchange.h
	similarity index 94%
	rename from amqp-1.6.1/amqp_exchange.h
	rename to amqp-1.7.0alpha1/amqp_exchange.h
	index cd88b95..432bc1e 100644
	--- a/amqp-1.6.1/amqp_exchange.h
	+++ b/amqp-1.7.0alpha1/amqp_exchange.h
	@@ -1,61 +1,63 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_exchange.h 318206 2011-10-19 04:17:01Z pdezwart $ */

	-void amqp_exchange_dtor(void *object TSRMLS_DC);
	-zend_object_value amqp_exchange_ctor(zend_class_entry *ce TSRMLS_DC);
	+extern zend_class_entry *amqp_exchange_class_entry;

	PHP_METHOD(amqp_exchange_class, __construct);

	PHP_METHOD(amqp_exchange_class, getName);
	PHP_METHOD(amqp_exchange_class, setName);

	PHP_METHOD(amqp_exchange_class, getType);
	PHP_METHOD(amqp_exchange_class, setType);

	PHP_METHOD(amqp_exchange_class, getFlags);
	PHP_METHOD(amqp_exchange_class, setFlags);

	PHP_METHOD(amqp_exchange_class, getArgument);
	PHP_METHOD(amqp_exchange_class, getArguments);
	PHP_METHOD(amqp_exchange_class, setArgument);
	PHP_METHOD(amqp_exchange_class, setArguments);
	+PHP_METHOD(amqp_exchange_class, hasArgument);

	PHP_METHOD(amqp_exchange_class, declareExchange);
	PHP_METHOD(amqp_exchange_class, delete);
	PHP_METHOD(amqp_exchange_class, bind);
	PHP_METHOD(amqp_exchange_class, unbind);
	PHP_METHOD(amqp_exchange_class, publish);

	PHP_METHOD(amqp_exchange_class, getChannel);
	PHP_METHOD(amqp_exchange_class, getConnection);

	+PHP_MINIT_FUNCTION(amqp_exchange);
	+
	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/amqp_queue.c b/amqp-1.7.0alpha1/amqp_queue.c
	new file mode 100644
	index 0000000..99c7754
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/amqp_queue.c
	@@ -0,0 +1,1244 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+/* $Id: amqp_queue.c 327551 2012-09-09 03:49:34Z pdezwart $ */
	+
	+#ifdef HAVE_CONFIG_H
	+#include "config.h"
	+#endif
	+
	+#include "php.h"
	+#include "php_ini.h"
	+#include "ext/standard/info.h"
	+#include "zend_exceptions.h"
	+
	+#ifdef PHP_WIN32
	+# include "win32/php_stdint.h"
	+# include "win32/signal.h"
	+#else
	+# include <signal.h>
	+# include <stdint.h>
	+#endif
	+#include <amqp.h>
	+#include <amqp_framing.h>
	+
	+#ifdef PHP_WIN32
	+# include "win32/unistd.h"
	+#else
	+# include <unistd.h>
	+#endif
	+
	+#include "php_amqp.h"
	+#include "amqp_envelope.h"
	+#include "amqp_connection.h"
	+#include "amqp_channel.h"
	+#include "amqp_queue.h"
	+
	+zend_class_entry *amqp_queue_class_entry;
	+#define this_ce amqp_queue_class_entry
	+
	+
	+/* {{{ proto AMQPQueue::__construct(AMQPChannel channel)
	+AMQPQueue constructor
	+*/
	+PHP_METHOD(amqp_queue_class, __construct)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t arguments PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ zval *channelObj;
	+ amqp_channel_resource *channel_resource;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &channelObj) == FAILURE) {
	+ return;
	+ }
	+
	+ PHP5to7_MAYBE_INIT(arguments);
	+ PHP5to7_ARRAY_INIT(arguments);
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), PHP5to7_MAYBE_PTR(arguments) TSRMLS_CC);
	+ PHP5to7_MAYBE_DESTROY(arguments);
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channelObj);
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not create queue.");
	+
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("channel"), channelObj TSRMLS_CC);
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("connection"), PHP_AMQP_READ_OBJ_PROP(amqp_channel_class_entry, channelObj, "connection") TSRMLS_CC);
	+
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::getName()
	+Get the queue name */
	+PHP_METHOD(amqp_queue_class, getName)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ if (PHP_AMQP_READ_THIS_PROP_STRLEN("name") > 0) {
	+ PHP_AMQP_RETURN_THIS_PROP("name");
	+ } else {
	+ /* BC */
	+ RETURN_FALSE;
	+ }
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::setName(string name)
	+Set the queue name */
	+PHP_METHOD(amqp_queue_class, setName)
	+{
	+ char *name = NULL; PHP5to7_param_str_len_type_t name_len = 0;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
	+ return;
	+ }
	+
	+ if (name_len < 1 \|\| name_len > 255) {
	+ /* Verify that the name is not null and not an empty string */
	+ zend_throw_exception(amqp_queue_exception_class_entry, "Invalid queue name given, must be between 1 and 255 characters long.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ /* Set the queue name */
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("name"), name, name_len TSRMLS_CC);
	+}
	+/* }}} */
	+
	+
	+
	+/* {{{ proto AMQPQueue::getFlags()
	+Get the queue parameters */
	+PHP_METHOD(amqp_queue_class, getFlags)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_param_long_type_t flagBitmask = 0;
	+
	+ PHP_AMQP_NOPARAMS();
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("passive")) {
	+ flagBitmask \|= AMQP_PASSIVE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("durable")) {
	+ flagBitmask \|= AMQP_DURABLE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("exclusive")) {
	+ flagBitmask \|= AMQP_EXCLUSIVE;
	+ }
	+
	+ if (PHP_AMQP_READ_THIS_PROP_BOOL("auto_delete")) {
	+ flagBitmask \|= AMQP_AUTODELETE;
	+ }
	+
	+ RETURN_LONG(flagBitmask);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::setFlags(long bitmask)
	+Set the queue parameters */
	+PHP_METHOD(amqp_queue_class, setFlags)
	+{
	+ PHP5to7_param_long_type_t flagBitmask;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flagBitmask) == FAILURE) {
	+ return;
	+ }
	+
	+ /* Set the flags based on the bitmask we were given */
	+ flagBitmask = flagBitmask ? flagBitmask & PHP_AMQP_QUEUE_FLAGS : flagBitmask;
	+
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("passive"), IS_PASSIVE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("durable"), IS_DURABLE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("exclusive"), IS_EXCLUSIVE(flagBitmask) TSRMLS_CC);
	+ zend_update_property_bool(this_ce, getThis(), ZEND_STRL("auto_delete"), IS_AUTODELETE(flagBitmask) TSRMLS_CC);
	+
	+ /* BC */
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::getArgument(string key)
	+Get the queue argument referenced by key */
	+PHP_METHOD(amqp_queue_class, getArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint)(key_len + 1), tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_ZVAL(PHP5to7_MAYBE_DEREF(tmp), 1, 0);
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPQueue::hasArgument(string key) */
	+PHP_METHOD(amqp_queue_class, hasArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ PHP5to7_zval_t *tmp = NULL;
	+
	+ char *key; PHP5to7_param_str_len_type_t key_len;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &key, &key_len) == FAILURE) {
	+ return;
	+ }
	+
	+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint)(key_len + 1), tmp)) {
	+ RETURN_FALSE;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::getArguments
	+Get the queue arguments */
	+PHP_METHOD(amqp_queue_class, getArguments)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("arguments");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPQueue::setArguments(array args)
	+Overwrite all queue arguments with given args */
	+PHP_METHOD(amqp_queue_class, setArguments)
	+{
	+ zval *zvalArguments;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ zend_update_property(this_ce, getThis(), ZEND_STRL("arguments"), zvalArguments TSRMLS_CC);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto AMQPQueue::setArgument(key, value)
	+Get the queue name */
	+PHP_METHOD(amqp_queue_class, setArgument)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ char *key= NULL; PHP5to7_param_str_len_type_t key_len = 0;
	+ zval *value = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz",
	+ &key, &key_len,
	+ &value) == FAILURE) {
	+ return;
	+ }
	+
	+ switch (Z_TYPE_P(value)) {
	+ case IS_NULL:
	+ PHP5to7_ZEND_HASH_DEL(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint) (key_len + 1));
	+ break;
	+ PHP5to7_CASE_IS_BOOL:
	+ case IS_LONG:
	+ case IS_DOUBLE:
	+ case IS_STRING:
	+ PHP5to7_ZEND_HASH_ADD(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (uint) (key_len + 1), value, sizeof(zval *));
	+ Z_TRY_ADDREF_P(value);
	+ break;
	+ default:
	+ zend_throw_exception(amqp_exchange_exception_class_entry, "The value parameter must be of type NULL, int, double or string.", 0 TSRMLS_CC);
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::declareQueue();
	+declare queue
	+*/
	+PHP_METHOD(amqp_queue_class, declareQueue)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *name;
	+ amqp_table_t *arguments;
	+ PHP5to7_param_long_type_t message_count;
	+
	+ if (zend_parse_parameters_none() == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not declare queue.");
	+
	+ arguments = convert_zval_to_amqp_table(PHP_AMQP_READ_THIS_PROP("arguments") TSRMLS_CC);
	+
	+ amqp_queue_declare_ok_t *r = amqp_queue_declare(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("passive"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("durable"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("exclusive"),
	+ PHP_AMQP_READ_THIS_PROP_BOOL("auto_delete"),
	+ *arguments
	+ );
	+
	+ php_amqp_free_amqp_table(arguments);
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ message_count = r->message_count;
	+
	+ /* Set the queue name, in case it is an autogenerated queue name */
	+ name = stringify_bytes(r->queue);
	+ zend_update_property_string(this_ce, getThis(), ZEND_STRL("name"), name TSRMLS_CC);
	+ efree(name);
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_LONG(message_count);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::bind(string exchangeName, [string routingKey, array arguments]);
	+bind queue to exchange by routing key
	+*/
	+PHP_METHOD(amqp_queue_class, bind)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *zvalArguments = NULL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *exchange_name; PHP5to7_param_str_len_type_t exchange_name_len;
	+ char *keyname = NULL; PHP5to7_param_str_len_type_t keyname_len = 0;
	+
	+ amqp_table_t *arguments = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|sa",
	+ &exchange_name, &exchange_name_len,
	+ &keyname, &keyname_len,
	+ &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not bind queue.");
	+
	+ if (zvalArguments) {
	+ arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	+ }
	+
	+ amqp_queue_bind(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (exchange_name_len > 0 ? amqp_cstring_bytes(exchange_name) : amqp_empty_bytes),
	+ (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	+ (arguments ? *arguments : amqp_empty_table)
	+ );
	+
	+ if (arguments) {
	+ php_amqp_free_amqp_table(arguments);
	+ }
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::get([bit flags=AMQP_NOPARAM]);
	+read messages from queue
	+return array (messages)
	+*/
	+PHP_METHOD(amqp_queue_class, get)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP5to7_zval_t message PHP5to7_MAYBE_SET_TO_NULL;
	+ PHP5to7_zval_t retval PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ PHP5to7_param_long_type_t flags = INI_INT("amqp.auto_ack") ? AMQP_AUTOACK : AMQP_NOPARAM;
	+
	+ /* Parse out the method parameters */
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|l", &flags) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not get messages from queue.");
	+
	+ amqp_rpc_reply_t res = amqp_basic_get(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (AMQP_AUTOACK & flags) ? 1 : 0
	+ );
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ if (AMQP_BASIC_GET_EMPTY_METHOD == res.reply.id) {
	+ RETURN_FALSE;
	+ }
	+
	+ assert(AMQP_BASIC_GET_OK_METHOD == res.reply.id);
	+
	+ /* Fill the envelope from response */
	+ amqp_basic_get_ok_t *get_ok_method = res.reply.decoded;
	+
	+ amqp_envelope_t envelope;
	+
	+ envelope.channel = channel_resource->channel_id;
	+ envelope.consumer_tag = amqp_empty_bytes;
	+ envelope.delivery_tag = get_ok_method->delivery_tag;
	+ envelope.redelivered = get_ok_method->redelivered;
	+ envelope.exchange = amqp_bytes_malloc_dup(get_ok_method->exchange);
	+ envelope.routing_key = amqp_bytes_malloc_dup(get_ok_method->routing_key);
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ res = amqp_read_message(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ &envelope.message,
	+ 0
	+ );
	+
	+ if (AMQP_RESPONSE_NORMAL != res.reply_type) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ amqp_destroy_envelope(&envelope);
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ PHP5to7_MAYBE_INIT(message);
	+
	+ convert_amqp_envelope_to_zval(&envelope, PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+ amqp_destroy_envelope(&envelope);
	+
	+ RETVAL_ZVAL(PHP5to7_MAYBE_PTR(message), 1, 0);
	+ PHP5to7_MAYBE_DESTROY(message);
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto array AMQPQueue::consume([callback, flags = <bitmask>, consumer_tag]);
	+consume the message
	+*/
	+PHP_METHOD(amqp_queue_class, consume)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ zend_fcall_info fci = empty_fcall_info;
	+ zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
	+
	+ amqp_table_t *arguments;
	+
	+ char *consumer_tag = NULL; PHP5to7_param_str_len_type_t consumer_tag_len = 0;
	+ PHP5to7_param_long_type_t flags = INI_INT("amqp.auto_ack") ? AMQP_AUTOACK : AMQP_NOPARAM;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|f!ls",
	+ &fci, &fci_cache,
	+ &flags,
	+ &consumer_tag, &consumer_tag_len) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not get channel.");
	+
	+ if (!(AMQP_JUST_CONSUME & flags)) {
	+ /* Setup the consume */
	+ arguments = convert_zval_to_amqp_table(PHP_AMQP_READ_THIS_PROP("arguments") TSRMLS_CC);
	+
	+ amqp_basic_consume_ok_t *r = amqp_basic_consume(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (consumer_tag_len > 0 ? amqp_cstring_bytes(consumer_tag) : amqp_empty_bytes), /* Consumer tag */
	+ (AMQP_NOLOCAL & flags) ? 1 : 0, /* No local */
	+ (AMQP_AUTOACK & flags) ? 1 : 0, /* no_ack, aka AUTOACK */
	+ PHP_AMQP_READ_THIS_PROP_BOOL("exclusive"),
	+ *arguments
	+ );
	+
	+ php_amqp_free_amqp_table(arguments);
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ zend_throw_exception(amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ /* Set the consumer tag name, in case it is an autogenerated consumer tag name */
	+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("consumer_tag"), (const char *) r->consumer_tag.bytes, (PHP5to7_param_str_len_type_t) r->consumer_tag.len TSRMLS_CC);
	+ }
	+
	+ if (!ZEND_FCI_INITIALIZED(fci)) {
	+ /* Callback not set, we have nothing to do - real consuming may happens later */
	+ return;
	+ }
	+
	+ struct timeval tv = {0};
	+ struct timeval *tv_ptr = &tv;
	+
	+ double read_timeout = PHP_AMQP_READ_OBJ_PROP_DOUBLE(amqp_connection_class_entry, PHP_AMQP_READ_THIS_PROP("connection"), "read_timeout");
	+
	+ if (read_timeout > 0) {
	+ tv.tv_sec = (long int) read_timeout;
	+ tv.tv_usec = (long int) ((read_timeout - tv.tv_sec) * 1000000);
	+ } else {
	+ tv_ptr = NULL;
	+ }
	+
	+ while(1) {
	+ /* Initialize the message */
	+ PHP5to7_zval_t message PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ amqp_envelope_t envelope;
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ amqp_rpc_reply_t res = amqp_consume_message(channel_resource->connection_resource->connection_state, &envelope, tv_ptr, 0);
	+
	+ if (AMQP_RESPONSE_LIBRARY_EXCEPTION == res.reply_type && AMQP_STATUS_TIMEOUT == res.library_error) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ zend_throw_exception(amqp_queue_exception_class_entry, "Consumer timeout exceed", 0 TSRMLS_CC);
	+
	+ amqp_destroy_envelope(&envelope);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ if (AMQP_RESPONSE_NORMAL != res.reply_type) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+
	+ amqp_destroy_envelope(&envelope);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ PHP5to7_MAYBE_INIT(message);
	+ convert_amqp_envelope_to_zval(&envelope, PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
	+
	+ amqp_destroy_envelope(&envelope);
	+
	+ /* Make the callback */
	+ PHP5to7_zval_t params PHP5to7_MAYBE_SET_TO_NULL;
	+ PHP5to7_zval_t retval PHP5to7_MAYBE_SET_TO_NULL;
	+
	+ /* Build the parameter array */
	+ PHP5to7_MAYBE_INIT(params);
	+ PHP5to7_ARRAY_INIT(params);
	+
	+ /* Dump it into the params array */
	+ add_index_zval(PHP5to7_MAYBE_PTR(params), 0, PHP5to7_MAYBE_PTR(message));
	+ Z_ADDREF_P( PHP5to7_MAYBE_PTR(message));
	+
	+ /* Add a pointer to the queue: */
	+ add_index_zval(PHP5to7_MAYBE_PTR(params), 1, getThis());
	+ Z_ADDREF_P(getThis());
	+
	+ /* Convert everything to be callable */
	+ zend_fcall_info_args(&fci, PHP5to7_MAYBE_PTR(params) TSRMLS_CC);
	+ /* Initialize the return value pointer */
	+
	+ PHP5to7_SET_FCI_RETVAL_PTR(fci, PHP5to7_MAYBE_PTR(retval));
	+
	+ /* Call the function, and track the return value */
	+ if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && PHP5to7_CHECK_FCI_RETVAL_PTR(fci)) {
	+ RETVAL_ZVAL(PHP5to7_MAYBE_PTR(retval), 1, 1);
	+ }
	+
	+ /* Clean up our mess */
	+ zend_fcall_info_args_clear(&fci, 1);
	+ PHP5to7_MAYBE_DESTROY(params);
	+ PHP5to7_MAYBE_DESTROY(message);
	+
	+ /* Check if user land function wants to bail */
	+ if (EG(exception) \|\| PHP5to7_IS_FALSE_P(return_value)) {
	+ break;
	+ }
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+ return;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::ack(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	+ acknowledge the message
	+*/
	+PHP_METHOD(amqp_queue_class, ack)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP5to7_param_long_type_t deliveryTag = 0;
	+ PHP5to7_param_long_type_t flags = AMQP_NOPARAM;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l\|l", &deliveryTag, &flags ) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not ack message.");
	+
	+ /* NOTE: basic.ack is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	+ int status = amqp_basic_ack(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (uint64_t) deliveryTag,
	+ (AMQP_MULTIPLE & flags) ? 1 : 0
	+ );
	+
	+ if (status != AMQP_STATUS_OK) {
	+ /* Emulate library error */
	+ amqp_rpc_reply_t res;
	+ res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	+ res.library_error = status;
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::nack(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	+ acknowledge the message
	+*/
	+PHP_METHOD(amqp_queue_class, nack)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP5to7_param_long_type_t deliveryTag = 0;
	+ PHP5to7_param_long_type_t flags = AMQP_NOPARAM;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l\|l", &deliveryTag, &flags ) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not nack message.");
	+
	+ /* NOTE: basic.nack is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	+ int status = amqp_basic_nack(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (uint64_t) deliveryTag,
	+ (AMQP_MULTIPLE & flags) ? 1 : 0,
	+ (AMQP_REQUEUE & flags) ? 1 : 0
	+ );
	+
	+ if (status != AMQP_STATUS_OK) {
	+ /* Emulate library error */
	+ amqp_rpc_reply_t res;
	+ res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	+ res.library_error = status;
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::reject(long deliveryTag, [bit flags=AMQP_NOPARAM]);
	+ acknowledge the message
	+*/
	+PHP_METHOD(amqp_queue_class, reject)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP5to7_param_long_type_t deliveryTag = 0;
	+ PHP5to7_param_long_type_t flags = AMQP_NOPARAM;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l\|l", &deliveryTag, &flags) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not reject message.");
	+
	+ /* NOTE: basic.reject is asynchronous and thus will not indicate failure if something goes wrong on the broker */
	+ int status = amqp_basic_reject(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ (uint64_t) deliveryTag,
	+ (AMQP_REQUEUE & flags) ? 1 : 0
	+ );
	+
	+ if (status != AMQP_STATUS_OK) {
	+ /* Emulate library error */
	+ amqp_rpc_reply_t res;
	+ res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
	+ res.library_error = status;
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::purge();
	+purge queue
	+*/
	+PHP_METHOD(amqp_queue_class, purge)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ if (zend_parse_parameters_none() == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not purge queue.");
	+
	+ amqp_queue_purge_ok_t *r = amqp_queue_purge(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name"))
	+ );
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ /* long message_count = r->message_count; */
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ /* RETURN_LONG(message_count) */;
	+
	+ /* BC */
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::cancel([string consumer_tag]);
	+cancel queue to consumer
	+*/
	+PHP_METHOD(amqp_queue_class, cancel)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ char *consumer_tag = NULL; PHP5to7_param_str_len_type_t consumer_tag_len = 0;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|s", &consumer_tag, &consumer_tag_len) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not cancel queue.");
	+
	+ if (!consumer_tag_len && !PHP_AMQP_READ_THIS_PROP_STRLEN("consumer_tag")) {
	+ return;
	+ }
	+
	+ amqp_basic_cancel_ok_t *r = amqp_basic_cancel(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ consumer_tag_len > 0 ? amqp_cstring_bytes(consumer_tag) : amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("consumer_tag"))
	+ );
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ if (!consumer_tag_len \|\| strcmp(consumer_tag, PHP_AMQP_READ_THIS_PROP_STR("consumer_tag")) != 0) {
	+ zend_update_property_null(this_ce, getThis(), ZEND_STRL("consumer_tag") TSRMLS_CC);
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::unbind(string exchangeName, [string routingKey, array arguments]);
	+unbind queue from exchange
	+*/
	+PHP_METHOD(amqp_queue_class, unbind)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ zval *zvalArguments = NULL;
	+ amqp_channel_resource *channel_resource;
	+
	+ char *exchange_name; PHP5to7_param_str_len_type_t exchange_name_len;
	+ char *keyname = NULL; PHP5to7_param_str_len_type_t keyname_len = 0;
	+
	+ amqp_table_t *arguments = NULL;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s\|sa",
	+ &exchange_name, &exchange_name_len,
	+ &keyname, &keyname_len,
	+ &zvalArguments) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not unbind queue.");
	+
	+ if (zvalArguments) {
	+ arguments = convert_zval_to_amqp_table(zvalArguments TSRMLS_CC);
	+ }
	+
	+ amqp_queue_unbind(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (exchange_name_len > 0 ? amqp_cstring_bytes(exchange_name) : amqp_empty_bytes),
	+ (keyname_len > 0 ? amqp_cstring_bytes(keyname) : amqp_empty_bytes),
	+ (arguments ? *arguments : amqp_empty_table)
	+ );
	+
	+ if (arguments) {
	+ php_amqp_free_amqp_table(arguments);
	+ }
	+
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ if (res.reply_type != AMQP_RESPONSE_NORMAL) {
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_TRUE;
	+}
	+/* }}} */
	+
	+
	+/* {{{ proto int AMQPQueue::delete([long flags = AMQP_NOPARAM]]);
	+delete queue and return the number of messages deleted in it
	+*/
	+PHP_METHOD(amqp_queue_class, delete)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+
	+ amqp_channel_resource *channel_resource;
	+
	+ PHP5to7_param_long_type_t flags = AMQP_NOPARAM;
	+
	+ PHP5to7_param_long_type_t message_count;
	+
	+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "\|l", &flags) == FAILURE) {
	+ return;
	+ }
	+
	+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(PHP_AMQP_READ_THIS_PROP("channel"));
	+ PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not delete queue.");
	+
	+ amqp_queue_delete_ok_t * r = amqp_queue_delete(
	+ channel_resource->connection_resource->connection_state,
	+ channel_resource->channel_id,
	+ amqp_cstring_bytes(PHP_AMQP_READ_THIS_PROP_STR("name")),
	+ (AMQP_IFUNUSED & flags) ? 1 : 0,
	+ (AMQP_IFEMPTY & flags) ? 1 : 0
	+ );
	+
	+ if (!r) {
	+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
	+
	+ PHP_AMQP_INIT_ERROR_MESSAGE();
	+
	+ php_amqp_error(res, PHP_AMQP_ERROR_MESSAGE_PTR, channel_resource->connection_resource, channel_resource TSRMLS_CC);
	+
	+ php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_ERROR_MESSAGE, 0 TSRMLS_CC);
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ PHP_AMQP_DESTROY_ERROR_MESSAGE();
	+ return;
	+ }
	+
	+ message_count = r->message_count;
	+
	+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
	+
	+ RETURN_LONG(message_count);
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPChannel::getChannel()
	+Get the AMQPChannel object in use */
	+PHP_METHOD(amqp_queue_class, getChannel)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("channel");
	+}
	+/* }}} */
	+
	+/* {{{ proto AMQPChannel::getConnection()
	+Get the AMQPConnection object in use */
	+PHP_METHOD(amqp_queue_class, getConnection)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("connection");
	+}
	+/* }}} */
	+
	+/* {{{ proto string AMQPChannel::getConsumerTag()
	+Get latest consumer tag*/
	+PHP_METHOD(amqp_queue_class, getConsumerTag)
	+{
	+ PHP5to7_READ_PROP_RV_PARAM_DECL;
	+ PHP_AMQP_NOPARAMS();
	+ PHP_AMQP_RETURN_THIS_PROP("consumer_tag");
	+}
	+
	+/* }}} */
	+/* amqp_queue_class ARG_INFO definition */
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_OBJ_INFO(0, amqp_channel, AMQPChannel, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, queue_name)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setFlags, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, argument)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 2)
	+ ZEND_ARG_INFO(0, key)
	+ ZEND_ARG_INFO(0, value)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_hasArgument, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, key)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_setArguments, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_ARRAY_INFO(0, arguments, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_declareQueue, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_bind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ ZEND_ARG_INFO(0, routing_key)
	+ ZEND_ARG_INFO(0, arguments)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_get, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_consume, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, callback)
	+ ZEND_ARG_INFO(0, flags)
	+ ZEND_ARG_INFO(0, consumer_tag)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_ack, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, delivery_tag)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_nack, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, delivery_tag)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_reject, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, delivery_tag)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_purge, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_cancel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_INFO(0, consumer_tag)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_unbind, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
	+ ZEND_ARG_INFO(0, exchange_name)
	+ ZEND_ARG_INFO(0, routing_key)
	+ ZEND_ARG_INFO(0, arguments)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_delete, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ ZEND_ARG_INFO(0, flags)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getChannel, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getConnection, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_queue_class_getConsumerTag, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
	+ZEND_END_ARG_INFO()
	+
	+zend_function_entry amqp_queue_class_functions[] = {
	+ PHP_ME(amqp_queue_class, __construct, arginfo_amqp_queue_class__construct, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, getName, arginfo_amqp_queue_class_getName, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, setName, arginfo_amqp_queue_class_setName, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, getFlags, arginfo_amqp_queue_class_getFlags, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, setFlags, arginfo_amqp_queue_class_setFlags, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, getArgument, arginfo_amqp_queue_class_getArgument, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, getArguments, arginfo_amqp_queue_class_getArguments, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, setArgument, arginfo_amqp_queue_class_setArgument, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, setArguments, arginfo_amqp_queue_class_setArguments, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, hasArgument, arginfo_amqp_queue_class_hasArgument, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, declareQueue, arginfo_amqp_queue_class_declareQueue, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, bind, arginfo_amqp_queue_class_bind, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, get, arginfo_amqp_queue_class_get, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, consume, arginfo_amqp_queue_class_consume, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, ack, arginfo_amqp_queue_class_ack, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, nack, arginfo_amqp_queue_class_nack, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, reject, arginfo_amqp_queue_class_reject, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, purge, arginfo_amqp_queue_class_purge, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, cancel, arginfo_amqp_queue_class_cancel, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, delete, arginfo_amqp_queue_class_delete, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, unbind, arginfo_amqp_queue_class_unbind, ZEND_ACC_PUBLIC)
	+
	+ PHP_ME(amqp_queue_class, getChannel, arginfo_amqp_queue_class_getChannel, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, getConnection, arginfo_amqp_queue_class_getConnection, ZEND_ACC_PUBLIC)
	+ PHP_ME(amqp_queue_class, getConsumerTag, arginfo_amqp_queue_class_getConsumerTag, ZEND_ACC_PUBLIC)
	+
	+ PHP_MALIAS(amqp_queue_class, declare, declareQueue, arginfo_amqp_queue_class_declareQueue, ZEND_ACC_PUBLIC \| ZEND_ACC_DEPRECATED)
	+
	+ {NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
	+};
	+
	+PHP_MINIT_FUNCTION(amqp_queue)
	+{
	+ zend_class_entry ce;
	+
	+ INIT_CLASS_ENTRY(ce, "AMQPQueue", amqp_queue_class_functions);
	+ this_ce = zend_register_internal_class(&ce TSRMLS_CC);
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("connection"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("channel"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_stringl(this_ce, ZEND_STRL("name"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_null(this_ce, ZEND_STRL("consumer_tag"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ zend_declare_property_bool(this_ce, ZEND_STRL("passive"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("durable"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ zend_declare_property_bool(this_ce, ZEND_STRL("exclusive"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
	+ /* By default, the auto_delete flag should be set */
	+ zend_declare_property_bool(this_ce, ZEND_STRL("auto_delete"), 1, ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+
	+
	+ zend_declare_property_null(this_ce, ZEND_STRL("arguments"), ZEND_ACC_PRIVATE TSRMLS_CC);
	+
	+ return SUCCESS;
	+}
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*tabstop: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.6.1/amqp_queue.h b/amqp-1.7.0alpha1/amqp_queue.h
	similarity index 95%
	rename from amqp-1.6.1/amqp_queue.h
	rename to amqp-1.7.0alpha1/amqp_queue.h
	index 14fc5f2..650eea0 100644
	--- a/amqp-1.6.1/amqp_queue.h
	+++ b/amqp-1.7.0alpha1/amqp_queue.h
	@@ -1,67 +1,69 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: amqp_queue.h 321959 2012-01-09 17:56:10Z pdezwart $ */

	-void amqp_queue_dtor(void *object TSRMLS_DC);
	-zend_object_value amqp_queue_ctor(zend_class_entry *ce TSRMLS_DC);
	+extern zend_class_entry *amqp_queue_class_entry;

	PHP_METHOD(amqp_queue_class, __construct);

	PHP_METHOD(amqp_queue_class, getName);
	PHP_METHOD(amqp_queue_class, setName);

	PHP_METHOD(amqp_queue_class, getFlags);
	PHP_METHOD(amqp_queue_class, setFlags);

	PHP_METHOD(amqp_queue_class, getArgument);
	PHP_METHOD(amqp_queue_class, getArguments);
	PHP_METHOD(amqp_queue_class, setArgument);
	PHP_METHOD(amqp_queue_class, setArguments);
	+PHP_METHOD(amqp_queue_class, hasArgument);

	PHP_METHOD(amqp_queue_class, declareQueue);
	PHP_METHOD(amqp_queue_class, bind);

	PHP_METHOD(amqp_queue_class, get);
	PHP_METHOD(amqp_queue_class, consume);
	PHP_METHOD(amqp_queue_class, ack);
	PHP_METHOD(amqp_queue_class, nack);
	PHP_METHOD(amqp_queue_class, reject);
	PHP_METHOD(amqp_queue_class, purge);

	PHP_METHOD(amqp_queue_class, cancel);
	PHP_METHOD(amqp_queue_class, unbind);
	PHP_METHOD(amqp_queue_class, delete);

	PHP_METHOD(amqp_queue_class, getChannel);
	PHP_METHOD(amqp_queue_class, getConnection);
	PHP_METHOD(amqp_queue_class, getConsumerTag);

	+PHP_MINIT_FUNCTION(amqp_queue);
	+
	/*
	*Local variables:
	*tab-width: 4
	*c-basic-offset: 4
	*End:
	*vim600: noet sw=4 ts=4 fdm=marker
	*vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/benchmark.php b/amqp-1.7.0alpha1/benchmark.php
	new file mode 100644
	index 0000000..f640dbe
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/benchmark.php
	@@ -0,0 +1,102 @@
	+<?php
	+
	+set_time_limit(getenv('TEST_TIMEOUT') ?: 120);
	+
	+try {
	+ $ext =new ReflectionExtension('xdebug');
	+ $xdebug = '(with xdebug '.$ext->getVersion().')';
	+} catch (Exception $e) {
	+ $xdebug = '(without xdebug)';
	+}
	+
	+$ext = new ReflectionExtension('amqp');
	+$srcVersion = $ext->getVersion();
	+
	+echo 'Running benchmark for php-amqp ', $srcVersion, ' on PHP ', PHP_VERSION, ' ', $xdebug, PHP_EOL;
	+
	+$iterations = 10000;
	+
	+if (isset($argv[1])) {
	+ $iterations = max((int) $argv[1], 0) ?: $iterations;
	+}
	+echo ' running ', $iterations, ' iterations:', PHP_EOL, PHP_EOL;
	+
	+
	+$conn = new AMQPConnection();
	+$conn->connect();
	+
	+$ch = new AMQPChannel($conn);
	+
	+$exchange = new AMQPExchange($ch);
	+$exchange->setType(AMQP_EX_TYPE_FANOUT);
	+$exchange->setFlags(AMQP_AUTODELETE);
	+$exchange->setName('benchmark_exchange_' . microtime(true));
	+$exchange->declareExchange();
	+
	+$q = new AMQPQueue($ch);
	+$q->setFlags(AMQP_AUTODELETE);
	+$q->declareQueue();
	+$q->bind($exchange->getName());
	+
	+
	+$message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
	+
	+$timer = microtime(true);
	+for ($i = 0; $i < $iterations; $i++) {
	+ $exchange->publish($message);
	+}
	+$timer = microtime(true) - $timer;
	+
	+echo 'Publish: ', $iterations, ' iterations took ', $timer, 'sec', PHP_EOL;
	+
	+
	+$timer = microtime(true);
	+for ($i = 0; $i < $iterations; $i++) {
	+ if (!$q->get(AMQP_AUTOACK)) {
	+ echo 'GET failed', PHP_EOL;
	+ }
	+}
	+$timer = microtime(true) - $timer;
	+
	+echo ' Get: ', $iterations, ' iterations took ', $timer, 'sec', PHP_EOL;
	+
	+$q->delete();
	+$exchange->delete();
	+
	+echo PHP_EOL;
	+// ==================================
	+
	+
	+$exchange = new AMQPExchange($ch);
	+$exchange->setType(AMQP_EX_TYPE_FANOUT);
	+$exchange->setFlags(AMQP_AUTODELETE);
	+$exchange->setName('benchmark_exchange_' . microtime(true));
	+$exchange->declareExchange();
	+
	+$q = new AMQPQueue($ch);
	+$q->setFlags(AMQP_AUTODELETE);
	+$q->declareQueue();
	+$q->bind($exchange->getName());
	+
	+$timer = microtime(true);
	+for ($i = 0; $i < $iterations; $i++) {
	+ $exchange->publish($message);
	+}
	+$timer = microtime(true) - $timer;
	+
	+echo 'Publish: ', $iterations, ' iterations took ', $timer, 'sec', PHP_EOL;
	+
	+$consumer_iterations = $iterations;
	+
	+$timer = microtime(true);
	+$q->consume(
	+ function () use (&$consumer_iterations) {
	+ return (--$consumer_iterations > 0);
	+ },
	+ AMQP_AUTOACK);
	+$timer = microtime(true) - $timer;
	+
	+echo 'Consume: ', $iterations, ' iterations took ', $timer, 'sec', PHP_EOL;
	+
	+$q->delete();
	+$exchange->delete();
	diff --git a/amqp-1.6.1/config.m4 b/amqp-1.7.0alpha1/config.m4
	similarity index 93%
	rename from amqp-1.6.1/config.m4
	rename to amqp-1.7.0alpha1/config.m4
	index c219769..c44104d 100644
	--- a/amqp-1.6.1/config.m4
	+++ b/amqp-1.7.0alpha1/config.m4
	@@ -1,89 +1,89 @@
	dnl $Id: config.m4 322428 2012-01-17 21:42:40Z pdezwart $
	dnl config.m4 for extension amqp

	dnl Comments in this file start with the string 'dnl'.
	dnl Remove where necessary. This file will not work
	dnl without editing.
	dnl amqp
	dnl If your extension references something external, use with:


	dnl Make sure that the comment is aligned:
	PHP_ARG_WITH(amqp, for amqp support,
	[ --with-amqp Include amqp support])

	PHP_ARG_WITH(librabbitmq-dir, for amqp,
	-[ --with-librabbitmq-dir[=DIR] Set the path to librabbit-mq install prefix.], yes)
	+[ --with-librabbitmq-dir[=DIR] Set the path to librabbitmq install prefix.], yes)


	if test "$PHP_AMQP" != "no"; then
	dnl Write more examples of tests here...

	AC_MSG_RESULT($PHP_AMQP)

	dnl # --with-amqp -> check with-path

	SEARCH_FOR="amqp_framing.h"

	AC_MSG_CHECKING([for amqp files in default path])
	if test "$PHP_LIBRABBITMQ_DIR" != "no" && test "$PHP_LIBRABBITMQ_DIR" != "yes"; then
	for i in $PHP_LIBRABBITMQ_DIR; do
	if test -r $i/include/$SEARCH_FOR;
	then
	AMQP_DIR=$i
	AC_MSG_RESULT(found in $i)
	break
	fi
	done
	else
	for i in $PHP_AMQP /usr/local /usr ; do
	if test -r $i/include/$SEARCH_FOR;
	then
	AMQP_DIR=$i
	AC_MSG_RESULT(found in $i)
	break
	fi
	done
	fi

	if test -z "$AMQP_DIR"; then
	AC_MSG_RESULT([not found])
	AC_MSG_ERROR([Please reinstall the librabbitmq distribution itself or (re)install librabbitmq development package if it available in your system])
	fi

	dnl # --with-amqp -> add include path

	PHP_ADD_INCLUDE($AMQP_DIR/include)

	dnl # --with-amqp -> check for lib and symbol presence

	LIBNAME=rabbitmq
	LIBSYMBOL=rabbitmq

	if test -z "$TRAVIS" ; then
	type git &>/dev/null

	if test $? -eq 0 ; then
	git describe --abbrev=0 --tags &>/dev/null

	if test $? -eq 0 ; then
	AC_DEFINE_UNQUOTED([PHP_AMQP_VERSION], ["`git describe --abbrev=0 --tags`-`git rev-parse --abbrev-ref HEAD`-dev"], [git version])
	fi

	git rev-parse --short HEAD &>/dev/null

	if test $? -eq 0 ; then
	AC_DEFINE_UNQUOTED([PHP_AMQP_REVISION], ["`git rev-parse --short HEAD`"], [git revision])
	fi
	else
	AC_MSG_NOTICE([git not installed. Cannot obtain php_amqp version tag. Install git.])
	fi
	fi

	PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $AMQP_DIR/$PHP_LIBDIR, AMQP_SHARED_LIBADD)
	PHP_SUBST(AMQP_SHARED_LIBADD)

	- AMQP_SOURCES="amqp.c amqp_exchange.c amqp_queue.c amqp_connection.c amqp_connection_resource.c amqp_channel.c amqp_envelope.c amqp_object_store.c"
	+ AMQP_SOURCES="amqp.c amqp_exchange.c amqp_queue.c amqp_connection.c amqp_connection_resource.c amqp_channel.c amqp_envelope.c"

	PHP_NEW_EXTENSION(amqp, $AMQP_SOURCES, $ext_shared)
	fi
	diff --git a/amqp-1.6.1/config.w32 b/amqp-1.7.0alpha1/config.w32
	similarity index 100%
	rename from amqp-1.6.1/config.w32
	rename to amqp-1.7.0alpha1/config.w32
	diff --git a/amqp-1.7.0alpha1/php5_support.h b/amqp-1.7.0alpha1/php5_support.h
	new file mode 100644
	index 0000000..5b2f35f
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/php5_support.h
	@@ -0,0 +1,113 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+#ifndef PHP_AMQP_PHP5_SUPPORT_H
	+#define PHP_AMQP_PHP5_SUPPORT_H
	+
	+typedef int PHP5to7_param_str_len_type_t;
	+typedef long PHP5to7_param_long_type_t;
	+typedef zval* PHP5to7_zval_t;
	+
	+#define PHP5to7_MAYBE_SET_TO_NULL = NULL
	+
	+#define PHP5to7_MAYBE_DEREF(zv) (*(zv))
	+#define PHP5to7_MAYBE_PTR(zv) (zv)
	+
	+#define PHP5to7_MAYBE_INIT(zv) MAKE_STD_ZVAL(zv);
	+#define PHP5to7_ARRAY_INIT(zv) array_init(zv);
	+#define PHP5to7_MAYBE_DESTROY(zv) zval_ptr_dtor(&(zv));
	+
	+#define PHP5to7_ZVAL_STRINGL_DUP(z, s, l) ZVAL_STRINGL((z), (s), (l), 1)
	+
	+#define PHP5to7_ADD_NEXT_INDEX_STRINGL_DUP(arg, str, length) add_next_index_stringl((arg), (str), (uint)(length), 1)
	+
	+#define PHP5to7_ZEND_HASH_FIND(ht, str, len, res) \
	+ (zend_hash_find((ht), (str), (uint)(len), (void **) &(res)) != FAILURE)
	+
	+#define PHP5to7_ZEND_HASH_DEL(ht, key, len) zend_hash_del_key_or_index((ht), (key), (uint)(len), 0, HASH_DEL_KEY);
	+#define PHP5to7_ZEND_HASH_ADD(ht, key, len, pData, nDataSize) (zend_hash_add((ht), (key), (uint)(len), &(pData), nDataSize, NULL) != FAILURE)
	+#define PHP5to7_ZEND_HASH_STR_UPD_MEM(ht, key, len, pData, nDataSize) PHP5to7_ZEND_HASH_ADD((ht), (key), (len), (pData), (nDataSize))
	+#define PHP5to7_ZEND_HASH_STR_FIND_PTR(ht, str, len, res) PHP5to7_ZEND_HASH_FIND((ht), (str), (len), (res))
	+
	+#define PHP5to7_SET_FCI_RETVAL_PTR(fci, pzv) (fci).retval_ptr_ptr = &(pzv);
	+#define PHP5to7_CHECK_FCI_RETVAL_PTR(fci) ((fci).retval_ptr_ptr && *(fci).retval_ptr_ptr)
	+
	+#define PHP5to7_IS_FALSE_P(pzv) ((Z_TYPE_P(pzv) == IS_BOOL && !Z_BVAL_P(pzv)))
	+
	+#define PHP5to7_obj_free_zend_object void
	+#define PHP5to7_zend_object_value zend_object_value
	+#define PHP5to7_zend_register_internal_class_ex(ce, parent_ce) zend_register_internal_class_ex((ce), (parent_ce), NULL TSRMLS_CC)
	+
	+#define PHP5to7_ECALLOC_CONNECTION_OBJECT(ce) (amqp_connection_object*)ecalloc(1, sizeof(amqp_connection_object))
	+#define PHP5to7_ECALLOC_CHANNEL_OBJECT(ce) (amqp_channel_object*)ecalloc(1, sizeof(amqp_channel_object))
	+
	+#define PHP5to7_CASE_IS_BOOL case IS_BOOL
	+
	+#define PHP5to7_READ_PROP_RV_PARAM_DECL
	+#define PHP5to7_READ_PROP_RV_PARAM_CC
	+
	+
	+#define PHP5to7_ZEND_REAL_HASH_KEY_T void
	+
	+#define PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, num_key, real_key, key, key_len, data, val, pos) \
	+ for ( \
	+ zend_hash_internal_pointer_reset_ex((ht), &(pos)); \
	+ zend_hash_get_current_data_ex((ht), (void*) &(data), &(pos)) == SUCCESS && ((value) = (data)); \
	+ zend_hash_move_forward_ex((ht), &(pos)) \
	+ )
	+
	+#define PHP5to7_ZEND_HASH_KEY_IS_STRING(ht, real_key, key, key_len, num_key, pos) \
	+ (zend_hash_get_current_key_ex((ht), &(key), &(key_len), &(num_key), 0, &(pos)) == HASH_KEY_IS_STRING)
	+
	+#define PHP5to7_ZEND_HASH_KEY_MAYBE_UNPACK(real_key, key, key_len)
	+
	+#define PHP5to7_ZEND_HASH_FOREACH_CONTINUE continue
	+#define PHP5to7_ZEND_HASH_FOREACH_END()
	+
	+#define Z_TRY_ADDREF_P(pz) Z_ADDREF_P(pz)
	+
	+/* Resources stuff */
	+
	+typedef int PHP5to7_zend_resource_t;
	+typedef zend_rsrc_list_entry PHP5to7_zend_resource_store_t;
	+typedef zend_rsrc_list_entry PHP5to7_zend_resource_le_t;
	+
	+#define PHP5to7_ZEND_RESOURCE_DTOR_ARG rsrc
	+#define Z_RES_P(le) (le)
	+
	+#define PHP5to7_ZEND_RESOURCE_EMPTY 0
	+#define PHP5to7_ZEND_RESOURCE_LE_EMPTY NULL
	+#define PHP5to7_ZEND_RSRC_TYPE_P(le) Z_TYPE_P(le)
	+#define PHP5to7_ZEND_REGISTER_RESOURCE(rsrc_pointer, rsrc_type) ZEND_REGISTER_RESOURCE(NULL, (rsrc_pointer), (rsrc_type))
	+
	+
	+#endif //PHP_AMQP_PHP5_SUPPORT_H
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.7.0alpha1/php7_support.h b/amqp-1.7.0alpha1/php7_support.h
	new file mode 100644
	index 0000000..34c247d
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/php7_support.h
	@@ -0,0 +1,105 @@
	+/*
	+ +----------------------------------------------------------------------+
	+ \| PHP Version 5 \|
	+ +----------------------------------------------------------------------+
	+ \| Copyright (c) 1997-2007 The PHP Group \|
	+ +----------------------------------------------------------------------+
	+ \| This source file is subject to version 3.01 of the PHP license, \|
	+ \| that is bundled with this package in the file LICENSE, and is \|
	+ \| available through the world-wide-web at the following url: \|
	+ \| http://www.php.net/license/3_01.txt \|
	+ \| If you did not receive a copy of the PHP license and are unable to \|
	+ \| obtain it through the world-wide-web, please send a note to \|
	+ \| license@php.net so we can mail you a copy immediately. \|
	+ +----------------------------------------------------------------------+
	+ \| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	+ \| Lead: \|
	+ \| - Pieter de Zwart \|
	+ \| Maintainers: \|
	+ \| - Brad Rodriguez \|
	+ \| - Jonathan Tansavatdi \|
	+ +----------------------------------------------------------------------+
	+*/
	+
	+#ifndef PHP_AMQP_PHP7_SUPPORT_H
	+#define PHP_AMQP_PHP7_SUPPORT_H
	+
	+typedef size_t PHP5to7_param_str_len_type_t;
	+typedef zend_long PHP5to7_param_long_type_t;
	+typedef zval PHP5to7_zval_t;
	+
	+#define PHP5to7_MAYBE_SET_TO_NULL
	+
	+#define PHP5to7_MAYBE_DEREF(zv) (zv)
	+#define PHP5to7_MAYBE_PTR(zv) (&(zv))
	+
	+#define PHP5to7_MAYBE_INIT(zv)
	+#define PHP5to7_ARRAY_INIT(zv) array_init(&(zv));
	+#define PHP5to7_MAYBE_DESTROY(zv) if (!Z_ISUNDEF(zv)) { zval_ptr_dtor(&(zv)); }
	+
	+#define PHP5to7_ZVAL_STRINGL_DUP(z, s, l) ZVAL_STRINGL((z), (s), (l))
	+#define PHP5to7_ADD_NEXT_INDEX_STRINGL_DUP(arg, str, length) add_next_index_stringl((arg), (str), (size_t)(length))
	+
	+#define PHP5to7_ZEND_HASH_FIND(ht, str, len, res) \
	+ ((res = zend_hash_str_find((ht), (str), (size_t)(len - 1))) != NULL)
	+
	+#define PHP5to7_ZEND_HASH_DEL(ht, key, len) zend_hash_str_del_ind((ht), (key), (uint)(len - 1))
	+#define PHP5to7_ZEND_HASH_ADD(ht, key, len, pData, nDataSize) zend_hash_str_add((ht), (key), (uint)(len - 1), (pData))
	+#define PHP5to7_ZEND_HASH_STR_UPD_MEM(ht, key, len, pData, nDataSize) zend_hash_str_update_mem((ht), (key), (size_t)(len), &(pData), (nDataSize))
	+#define PHP5to7_ZEND_HASH_STR_FIND_PTR(ht, str, len, res) ((res = zend_hash_str_find_ptr((ht), (key), (size_t)(len))) != NULL)
	+
	+#define PHP5to7_SET_FCI_RETVAL_PTR(fci, pzv) (fci).retval = (pzv);
	+#define PHP5to7_CHECK_FCI_RETVAL_PTR(fci) ((fci).retval)
	+
	+#define PHP5to7_IS_FALSE_P(pzv) (Z_TYPE_P(return_value) == IS_FALSE)
	+
	+#define PHP5to7_obj_free_zend_object zend_object
	+#define PHP5to7_zend_object_value zend_object *
	+#define PHP5to7_zend_register_internal_class_ex(ce, parent_ce) zend_register_internal_class_ex((ce), (parent_ce) TSRMLS_CC)
	+
	+#define PHP5to7_ECALLOC_CONNECTION_OBJECT(ce) (amqp_connection_object*)ecalloc(1, sizeof(amqp_connection_object) + zend_object_properties_size(ce))
	+#define PHP5to7_ECALLOC_CHANNEL_OBJECT(ce) (amqp_channel_object*)ecalloc(1, sizeof(amqp_channel_object) + zend_object_properties_size(ce))
	+
	+#define PHP5to7_CASE_IS_BOOL case IS_TRUE: case IS_FALSE
	+
	+#define PHP5to7_READ_PROP_RV_PARAM_DECL zval rv;
	+#define PHP5to7_READ_PROP_RV_PARAM_CC , (&rv)
	+
	+#define Z_BVAL_P(zval_p) (Z_TYPE_P(zval_p) == IS_TRUE)
	+
	+#define PHP5to7_ZEND_REAL_HASH_KEY_T zend_string
	+
	+#define PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, num_key, real_key, key, key_len, data, val, pos) \
	+ ZEND_HASH_FOREACH_KEY_VAL((ht), (num_key), (real_key), (val))
	+
	+#define PHP5to7_ZEND_HASH_KEY_IS_STRING(ht, real_key, key, key_len, num_key, pos) \
	+ (real_key)
	+
	+#define PHP5to7_ZEND_HASH_KEY_MAYBE_UNPACK(real_key, key, key_len) \
	+ (key_len) = ZSTR_LEN(real_key); \
	+ (key) = ZSTR_VAL(real_key);
	+
	+#define PHP5to7_ZEND_HASH_FOREACH_CONTINUE continue
	+#define PHP5to7_ZEND_HASH_FOREACH_END() ZEND_HASH_FOREACH_END();
	+
	+/* Resources stuff */
	+typedef zend_resource* PHP5to7_zend_resource_t;
	+typedef zend_resource PHP5to7_zend_resource_store_t;
	+typedef zval PHP5to7_zend_resource_le_t;
	+
	+#define PHP5to7_ZEND_RESOURCE_DTOR_ARG res
	+#define PHP5to7_ZEND_RESOURCE_EMPTY NULL
	+#define PHP5to7_ZEND_RESOURCE_LE_EMPTY NULL
	+#define PHP5to7_ZEND_RSRC_TYPE_P(le) (le)->type
	+#define PHP5to7_ZEND_REGISTER_RESOURCE(rsrc_pointer, rsrc_type) zend_register_resource((rsrc_pointer), (rsrc_type))
	+
	+#endif //PHP_AMQP_PHP7_SUPPORT_H
	+
	+/*
	+*Local variables:
	+*tab-width: 4
	+*c-basic-offset: 4
	+*End:
	+*vim600: noet sw=4 ts=4 fdm=marker
	+*vim<600: noet sw=4 ts=4
	+*/
	diff --git a/amqp-1.6.1/php_amqp.h b/amqp-1.7.0alpha1/php_amqp.h
	similarity index 54%
	rename from amqp-1.6.1/php_amqp.h
	rename to amqp-1.7.0alpha1/php_amqp.h
	index 837f89d..cf40f31 100644
	--- a/amqp-1.6.1/php_amqp.h
	+++ b/amqp-1.7.0alpha1/php_amqp.h
	@@ -1,466 +1,347 @@
	/*
	+----------------------------------------------------------------------+
	\| PHP Version 5 \|
	+----------------------------------------------------------------------+
	\| Copyright (c) 1997-2007 The PHP Group \|
	+----------------------------------------------------------------------+
	\| This source file is subject to version 3.01 of the PHP license, \|
	\| that is bundled with this package in the file LICENSE, and is \|
	\| available through the world-wide-web at the following url: \|
	\| http://www.php.net/license/3_01.txt \|
	\| If you did not receive a copy of the PHP license and are unable to \|
	\| obtain it through the world-wide-web, please send a note to \|
	\| license@php.net so we can mail you a copy immediately. \|
	+----------------------------------------------------------------------+
	\| Author: Alexandre Kalendarev akalend@mail.ru Copyright (c) 2009-2010 \|
	\| Lead: \|
	\| - Pieter de Zwart \|
	\| Maintainers: \|
	\| - Brad Rodriguez \|
	\| - Jonathan Tansavatdi \|
	+----------------------------------------------------------------------+
	*/

	/* $Id: php_amqp.h 327551 2012-09-09 03:49:34Z pdezwart $ */

	#ifndef PHP_AMQP_H
	#define PHP_AMQP_H



	-/* Add pseudo refcount macros for PHP version < 5.3 */
	-#ifndef Z_REFCOUNT_PP
	-
	-#define Z_REFCOUNT_PP(ppz) Z_REFCOUNT_P(*(ppz))
	-#define Z_SET_REFCOUNT_PP(ppz, rc) Z_SET_REFCOUNT_P(*(ppz), rc)
	-#define Z_ADDREF_PP(ppz) Z_ADDREF_P(*(ppz))
	-#define Z_DELREF_PP(ppz) Z_DELREF_P(*(ppz))
	-#define Z_ISREF_PP(ppz) Z_ISREF_P(*(ppz))
	-#define Z_SET_ISREF_PP(ppz) Z_SET_ISREF_P(*(ppz))
	-#define Z_UNSET_ISREF_PP(ppz) Z_UNSET_ISREF_P(*(ppz))
	-#define Z_SET_ISREF_TO_PP(ppz, isref) Z_SET_ISREF_TO_P(*(ppz), isref)
	-
	-#define Z_REFCOUNT_P(pz) zval_refcount_p(pz)
	-#define Z_SET_REFCOUNT_P(pz, rc) zval_set_refcount_p(pz, rc)
	-#define Z_ADDREF_P(pz) zval_addref_p(pz)
	-#define Z_DELREF_P(pz) zval_delref_p(pz)
	-#define Z_ISREF_P(pz) zval_isref_p(pz)
	-#define Z_SET_ISREF_P(pz) zval_set_isref_p(pz)
	-#define Z_UNSET_ISREF_P(pz) zval_unset_isref_p(pz)
	-#define Z_SET_ISREF_TO_P(pz, isref) zval_set_isref_to_p(pz, isref)
	-
	-#define Z_REFCOUNT(z) Z_REFCOUNT_P(&(z))
	-#define Z_SET_REFCOUNT(z, rc) Z_SET_REFCOUNT_P(&(z), rc)
	-#define Z_ADDREF(z) Z_ADDREF_P(&(z))
	-#define Z_DELREF(z) Z_DELREF_P(&(z))
	-#define Z_ISREF(z) Z_ISREF_P(&(z))
	-#define Z_SET_ISREF(z) Z_SET_ISREF_P(&(z))
	-#define Z_UNSET_ISREF(z) Z_UNSET_ISREF_P(&(z))
	-#define Z_SET_ISREF_TO(z, isref) Z_SET_ISREF_TO_P(&(z), isref)
	-
	-#define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)
	-
	-#define MAKE_COPY_ZVAL(ppzv, pzv) \
	- (pzv) = *(ppzv); \
	- zval_copy_ctor((pzv)); \
	- INIT_PZVAL((pzv));
	-
	-#if defined(__GNUC__)
	-#define zend_always_inline inline __attribute__((always_inline))
	-#elif defined(_MSC_VER)
	-#define zend_always_inline __forceinline
	-#else
	-#define zend_always_inline inline
	-#endif
	-
	-static zend_always_inline zend_uint zval_refcount_p(zval* pz) {
	- return pz->refcount;
	-}
	-
	-static zend_always_inline zend_uint zval_set_refcount_p(zval* pz, zend_uint rc) {
	- return pz->refcount = rc;
	-}
	-
	-static zend_always_inline zend_uint zval_addref_p(zval* pz) {
	- return ++pz->refcount;
	-}
	-
	-static zend_always_inline zend_uint zval_delref_p(zval* pz) {
	- return --pz->refcount;
	-}
	-
	-static zend_always_inline zend_bool zval_isref_p(zval* pz) {
	- return pz->is_ref;
	-}
	-
	-static zend_always_inline zend_bool zval_set_isref_p(zval* pz) {
	- return pz->is_ref = 1;
	-}
	-
	-static zend_always_inline zend_bool zval_unset_isref_p(zval* pz) {
	- return pz->is_ref = 0;
	-}
	-
	-static zend_always_inline zend_bool zval_set_isref_to_p(zval* pz, zend_bool isref) {
	- return pz->is_ref = isref;
	-}
	-
	-static zend_always_inline zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0 };
	+#include "amqp.h"

	+#if PHP_MAJOR_VERSION >= 7
	+ #include "php7_support.h"
	#else
	-
	-#define PHP_ATLEAST_5_3 true
	-
	+ #include "php5_support.h"
	#endif

	-
	-#include "amqp.h"
	-#include "amqp_object_store.h"
	-
	extern zend_module_entry amqp_module_entry;
	#define phpext_amqp_ptr &amqp_module_entry

	#ifdef PHP_WIN32
	#define PHP_AMQP_API __declspec(dllexport)
	#else
	#define PHP_AMQP_API
	#endif

	#ifdef ZTS
	#include "TSRM.h"
	#endif

	#define AMQP_NOPARAM 0
	/* Where is 1?*/
	#define AMQP_JUST_CONSUME 1
	#define AMQP_DURABLE 2
	#define AMQP_PASSIVE 4
	#define AMQP_EXCLUSIVE 8
	#define AMQP_AUTODELETE 16
	#define AMQP_INTERNAL 32
	#define AMQP_NOLOCAL 64
	#define AMQP_AUTOACK 128
	#define AMQP_IFEMPTY 256
	#define AMQP_IFUNUSED 512
	#define AMQP_MANDATORY 1024
	#define AMQP_IMMEDIATE 2048
	#define AMQP_MULTIPLE 4096
	#define AMQP_NOWAIT 8192
	#define AMQP_REQUEUE 16384

	/* passive, durable, auto-delete, internal, no-wait (see https://www.rabbitmq.com/amqp-0-9-1-reference.html#exchange.declare) */
	#define PHP_AMQP_EXCHANGE_FLAGS (AMQP_PASSIVE \| AMQP_DURABLE \| AMQP_AUTODELETE \| AMQP_INTERNAL)

	/* passive, durable, exclusive, auto-delete, no-wait (see https://www.rabbitmq.com/amqp-0-9-1-reference.html#queue.declare) */
	#define PHP_AMQP_QUEUE_FLAGS (AMQP_PASSIVE \| AMQP_DURABLE \| AMQP_EXCLUSIVE \| AMQP_AUTODELETE \| AMQP_EXCLUSIVE)

	#define AMQP_EX_TYPE_DIRECT "direct"
	#define AMQP_EX_TYPE_FANOUT "fanout"
	#define AMQP_EX_TYPE_TOPIC "topic"
	#define AMQP_EX_TYPE_HEADERS "headers"

	#define PHP_AMQP_CONNECTION_RES_NAME "AMQP Connection Resource"

	PHP_MINIT_FUNCTION(amqp);
	PHP_MSHUTDOWN_FUNCTION(amqp);
	PHP_MINFO_FUNCTION(amqp);

	amqp_table_t convert_zval_to_amqp_table(zval zvalArguments TSRMLS_DC);
	void php_amqp_free_amqp_table(amqp_table_t * table);

	char *stringify_bytes(amqp_bytes_t bytes);

	/* True global resources - no need for thread safety here */
	-extern zend_class_entry *amqp_connection_class_entry;
	-extern zend_class_entry *amqp_channel_class_entry;
	-extern zend_class_entry *amqp_queue_class_entry;
	-extern zend_class_entry *amqp_exchange_class_entry;
	-extern zend_class_entry *amqp_envelope_class_entry;
	-
	extern zend_class_entry *amqp_exception_class_entry,
	*amqp_connection_exception_class_entry,
	*amqp_channel_exception_class_entry,
	*amqp_exchange_exception_class_entry,
	*amqp_queue_exception_class_entry;


	+typedef struct _amqp_connection_resource amqp_connection_resource;
	+typedef struct _amqp_connection_object amqp_connection_object;
	+
	+typedef struct _amqp_channel_resource {
	+ char is_connected;
	+ amqp_channel_t channel_id;
	+ amqp_connection_resource *connection_resource;
	+} amqp_channel_resource;
	+
	+/* NOTE: due to how interanlly PHP works with custom object, zend_object position in structure matters */
	+
	+typedef struct _amqp_channel_object {
	+#if PHP_MAJOR_VERSION >= 7
	+ amqp_channel_resource *channel_resource;
	+ zend_object zo;
	+#else
	+ zend_object zo;
	+ amqp_channel_resource *channel_resource;
	+#endif
	+} amqp_channel_object;
	+
	+typedef struct _amqp_connection_resource {
	+ zend_bool is_connected;
	+ zend_bool is_persistent;
	+ zend_bool is_dirty;
	+ PHP5to7_zend_resource_t resource;
	+ amqp_connection_object *parent;
	+ amqp_channel_t max_slots;
	+ amqp_channel_t used_slots;
	+ amqp_channel_resource **slots;
	+ char *resource_key;
	+ PHP5to7_param_str_len_type_t resource_key_len;
	+ amqp_connection_state_t connection_state;
	+ amqp_socket_t *socket;
	+} amqp_connection_resource;
	+
	+typedef struct _amqp_connection_object {
	+#if PHP_MAJOR_VERSION >= 7
	+ amqp_connection_resource *connection_resource;
	+ zend_object zo;
	+#else
	+ zend_object zo;
	+ amqp_connection_resource *connection_resource;
	+#endif
	+} amqp_connection_object;
	+
	#define DEFAULT_PORT "5672" /* default AMQP port */
	#define DEFAULT_HOST "localhost"
	#define DEFAULT_TIMEOUT ""
	#define DEFAULT_READ_TIMEOUT "0"
	#define DEFAULT_WRITE_TIMEOUT "0"
	#define DEFAULT_CONNECT_TIMEOUT "0"
	#define DEFAULT_VHOST "/"
	#define DEFAULT_LOGIN "guest"
	#define DEFAULT_PASSWORD "guest"
	#define DEFAULT_AUTOACK "0" /* These are all strings to facilitate setting default ini values */
	#define DEFAULT_PREFETCH_COUNT "3"

	/* Usually, default is 0 which means 65535, but underlying rabbitmq-c library pool allocates minimal pool for each channel,
	* so it takes a lot of memory to keep all that channels. Even after channel closing that buffer still keep memory allocation.
	*/
	/* #define DEFAULT_CHANNELS_PER_CONNECTION AMQP_DEFAULT_MAX_CHANNELS */
	#define PHP_AMQP_PROTOCOL_MAX_CHANNELS 256

	-//AMQP_DEFAULT_FRAME_SIZE 131072
	+/* AMQP_DEFAULT_FRAME_SIZE 131072 */

	#if PHP_AMQP_PROTOCOL_MAX_CHANNELS > 0
	#define PHP_AMQP_MAX_CHANNELS PHP_AMQP_PROTOCOL_MAX_CHANNELS
	#else
	#define PHP_AMQP_MAX_CHANNELS 65535 // Note that the maximum number of channels the protocol supports is 65535 (2^16, with the 0-channel reserved)
	#endif

	#define PHP_AMQP_MAX_FRAME INT_MAX
	#define PHP_AMQP_MAX_HEARTBEAT INT_MAX

	#define PHP_AMQP_DEFAULT_CHANNEL_MAX PHP_AMQP_MAX_CHANNELS
	#define PHP_AMQP_DEFAULT_FRAME_MAX AMQP_DEFAULT_FRAME_SIZE
	#define PHP_AMQP_DEFAULT_HEARTBEAT AMQP_DEFAULT_HEARTBEAT

	#define PHP_AMQP_STRINGIFY(value) PHP_AMQP_TO_STRING(value)
	#define PHP_AMQP_TO_STRING(value) #value


	#define DEFAULT_CHANNEL_MAX PHP_AMQP_STRINGIFY(PHP_AMQP_MAX_CHANNELS)
	#define DEFAULT_FRAME_MAX PHP_AMQP_STRINGIFY(PHP_AMQP_DEFAULT_FRAME_MAX)
	#define DEFAULT_HEARTBEAT PHP_AMQP_STRINGIFY(PHP_AMQP_DEFAULT_HEARTBEAT)

	-#define AMQP_READ_SUCCESS 1
	-#define AMQP_READ_NO_MESSAGES 0
	-#define AMQP_READ_ERROR -1
	-

	#define IS_PASSIVE(bitmask) (AMQP_PASSIVE & (bitmask)) ? 1 : 0
	#define IS_DURABLE(bitmask) (AMQP_DURABLE & (bitmask)) ? 1 : 0
	#define IS_EXCLUSIVE(bitmask) (AMQP_EXCLUSIVE & (bitmask)) ? 1 : 0
	#define IS_AUTODELETE(bitmask) (AMQP_AUTODELETE & (bitmask)) ? 1 : 0
	#define IS_INTERNAL(bitmask) (AMQP_INTERNAL & (bitmask)) ? 1 : 0
	#define IS_NOWAIT(bitmask) (AMQP_NOWAIT & (bitmask)) ? 1 : 0 /* NOTE: always 0 in rabbitmq-c internals, so don't use it unless you are clearly understand aftermath*/

	+#define PHP_AMQP_NOPARAMS() if (zend_parse_parameters_none() == FAILURE) { return; }

	+#define PHP_AMQP_RETURN_THIS_PROP(prop_name) \
	+ zval * _zv = zend_read_property(this_ce, getThis(), ZEND_STRL(prop_name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC); \
	+ RETURN_ZVAL(_zv, 1, 0); \

	-#define AMQP_SET_NAME(object, str) \
	- (object)->name_len = strlen(str) >= sizeof((object)->name) ? sizeof((object)->name) - 1 : strlen(str); \
	- strncpy((object)->name, name, (object)->name_len); \
	- (object)->name[(object)->name_len] = '\0';
	+#define PHP_AMQP_READ_OBJ_PROP(cls, obj, name) zend_read_property((cls), (obj), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
	+#define PHP_AMQP_READ_OBJ_PROP_DOUBLE(cls, obj, name) Z_DVAL_P(PHP_AMQP_READ_OBJ_PROP((cls), (obj), (name)))

	-#define AMQP_SET_TYPE(object, str) \
	- (object)->type_len = strlen(str) >= sizeof((object)->type) ? sizeof((object)->type) - 1 : strlen(str); \
	- strncpy((object)->type, type, (object)->type_len); \
	- (object)->type[(object)->type_len] = '\0';
	+#define PHP_AMQP_READ_THIS_PROP(name) zend_read_property(this_ce, getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
	+#define PHP_AMQP_READ_THIS_PROP_BOOL(name) Z_BVAL_P(PHP_AMQP_READ_THIS_PROP(name))
	+#define PHP_AMQP_READ_THIS_PROP_STR(name) Z_STRVAL_P(PHP_AMQP_READ_THIS_PROP(name))
	+#define PHP_AMQP_READ_THIS_PROP_STRLEN(name) (Z_TYPE_P(PHP_AMQP_READ_THIS_PROP(name)) == IS_STRING ? Z_STRLEN_P(PHP_AMQP_READ_THIS_PROP(name)) : 0)
	+#define PHP_AMQP_READ_THIS_PROP_ARR(name) Z_ARRVAL_P(PHP_AMQP_READ_THIS_PROP(name))
	+#define PHP_AMQP_READ_THIS_PROP_LONG(name) Z_LVAL_P(PHP_AMQP_READ_THIS_PROP(name))
	+#define PHP_AMQP_READ_THIS_PROP_DOUBLE(name) Z_DVAL_P(PHP_AMQP_READ_THIS_PROP(name))

	-#define AMQP_SET_LONG_PROPERTY(object, value) \
	- (object) = (value);

	-#define AMQP_SET_BOOL_PROPERTY(object, value) \
	- (object) = (value) == 0 ? 0 : 1;
	+#if PHP_MAJOR_VERSION >= 7
	+ static inline amqp_connection_object php_amqp_connection_object_fetch(zend_object obj) {
	+ return (amqp_connection_object )((char )obj - XtOffsetOf(amqp_connection_object, zo));
	+ }

	-#define AMQP_SET_STR_PROPERTY(object, str, len) \
	- strncpy((object), (str), (len) >= sizeof(object) ? sizeof(object) - 1 : (len)); \
	- (object)[(len) >= sizeof(object) ? sizeof(object) - 1 : (len)] = '\0';
	+ static inline amqp_channel_object php_amqp_channel_object_fetch(zend_object obj) {
	+ return (amqp_channel_object )((char )obj - XtOffsetOf(amqp_channel_object, zo));
	+ }

	-#define AMQP_GET_CHANNEL(object) \
	- (amqp_channel_object *) amqp_object_store_get_valid_object((object)->channel TSRMLS_CC);
	+ #define PHP_AMQP_GET_CONNECTION(obj) php_amqp_connection_object_fetch(Z_OBJ_P(obj))
	+ #define PHP_AMQP_GET_CHANNEL(obj) php_amqp_channel_object_fetch(Z_OBJ_P(obj))

	-#define AMQP_ASSIGN_CHANNEL(channel, object) \
	- if (!(object)->channel) { \
	- return; \
	- } \
	- channel = AMQP_GET_CHANNEL(object)
	+ #define PHP_AMQP_FETCH_CONNECTION(obj) php_amqp_connection_object_fetch(obj)
	+ #define PHP_AMQP_FETCH_CHANNEL(obj) php_amqp_channel_object_fetch(obj)
	+
	+#else
	+ #define PHP_AMQP_GET_CONNECTION(obj) (amqp_connection_object *)zend_object_store_get_object((obj) TSRMLS_CC)
	+ #define PHP_AMQP_GET_CHANNEL(obj) (amqp_channel_object *)zend_object_store_get_object((obj) TSRMLS_CC)
	+
	+ #define PHP_AMQP_FETCH_CONNECTION(obj) (amqp_connection_object*)(obj)
	+ #define PHP_AMQP_FETCH_CHANNEL(obj) (amqp_channel_object*)(obj)
	+#endif
	+
	+
	+#define PHP_AMQP_GET_CHANNEL_RESOURCE(obj) (PHP_AMQP_GET_CHANNEL(obj))->channel_resource

	-#define AMQP_GET_CONNECTION(object) \
	- (amqp_connection_object *) amqp_object_store_get_valid_object((object)->connection TSRMLS_CC);

	-#define AMQP_ASSIGN_CONNECTION(connection, object) \
	- if (!(object)->connection) { \
	+#define PHP_AMQP_VERIFY_CONNECTION_ERROR(error, reason) \
	+ char verify_connection_error_tmp[255]; \
	+ snprintf(verify_connection_error_tmp, 255, "%s %s", error, reason); \
	+ zend_throw_exception(amqp_connection_exception_class_entry, verify_connection_error_tmp, 0 TSRMLS_CC); \
	return; \
	- } \
	- connection = AMQP_GET_CONNECTION(object)

	+#define PHP_AMQP_VERIFY_CONNECTION(connection, error) \
	+ if (!connection) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "Stale reference to the connection object.") \
	+ } \
	+ if (!(connection)->connection_resource \|\| !(connection)->connection_resource->is_connected) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "No connection available.") \
	+ } \

	-#define AMQP_VERIFY_CHANNEL_ERROR(error, reason) \
	+#define PHP_AMQP_VERIFY_CHANNEL_ERROR(error, reason) \
	char verify_channel_error_tmp[255]; \
	snprintf(verify_channel_error_tmp, 255, "%s %s", error, reason); \
	zend_throw_exception(amqp_channel_exception_class_entry, verify_channel_error_tmp, 0 TSRMLS_CC); \
	return; \

	-#define AMQP_VERIFY_CHANNEL(channel, error) \
	- if (!channel) { \
	- AMQP_VERIFY_CHANNEL_ERROR(error, "Stale reference to the channel object.") \
	+#define PHP_AMQP_VERIFY_CHANNEL_RESOURCE(resource, error) \
	+ if (!resource) { \
	+ PHP_AMQP_VERIFY_CHANNEL_ERROR(error, "Stale reference to the channel object.") \
	} \
	- if ((channel)->is_connected != '\1') { \
	- AMQP_VERIFY_CHANNEL_ERROR(error, "No channel available.") \
	+ if (!(resource)->is_connected) { \
	+ PHP_AMQP_VERIFY_CHANNEL_ERROR(error, "No channel available.") \
	+ } \
	+ if (!(resource)->connection_resource) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "Stale reference to the connection object.") \
	+ } \
	+ if (!(resource)->connection_resource->is_connected) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "No connection available.") \
	} \

	-#define AMQP_VERIFY_CONNECTION_ERROR(error, reason) \
	- char verify_connection_error_tmp[255]; \
	- snprintf(verify_connection_error_tmp, 255, "%s %s", error, reason); \
	- zend_throw_exception(amqp_connection_exception_class_entry, verify_connection_error_tmp, 0 TSRMLS_CC); \
	- return; \
	-
	-#define AMQP_VERIFY_CONNECTION(connection, error) \
	- if (!connection) { \
	- AMQP_VERIFY_CONNECTION_ERROR(error, "Stale reference to the connection object.") \
	+#define PHP_AMQP_VERIFY_CHANNEL_CONNECTION_RESOURCE(resource, error) \
	+ if (!resource) { \
	+ PHP_AMQP_VERIFY_CHANNEL_ERROR(error, "Stale reference to the channel object.") \
	+ } \
	+ if (!(resource)->connection_resource) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "Stale reference to the connection object.") \
	} \
	- if ((connection)->is_connected != '\1') { \
	- AMQP_VERIFY_CONNECTION_ERROR(error, "No connection available.") \
	+ if (!(resource)->connection_resource->is_connected) { \
	+ PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "No connection available.") \
	} \

	+
	#define PHP_AMQP_ERROR_MESSAGE_PTR &php_amqp_internal_error_message
	#define PHP_AMQP_ERROR_MESSAGE php_amqp_internal_error_message

	#define PHP_AMQP_INIT_ERROR_MESSAGE()\
	char *PHP_AMQP_ERROR_MESSAGE = NULL;

	#define PHP_AMQP_DESTROY_ERROR_MESSAGE()\
	if (PHP_AMQP_ERROR_MESSAGE != NULL) { efree(PHP_AMQP_ERROR_MESSAGE); }

	#if ZEND_MODULE_API_NO >= 20100000
	- #define AMQP_OBJECT_PROPERTIES_INIT(obj, ce) object_properties_init(&obj, ce);
	+ #define AMQP_OBJECT_PROPERTIES_INIT(obj, ce) object_properties_init(&(obj), ce);
	#else
	#define AMQP_OBJECT_PROPERTIES_INIT(obj, ce) \
	do { \
	zval *tmp; \
	zend_hash_copy((obj).properties, &(ce)->default_properties, (copy_ctor_func_t) zval_add_ref, (void ) &tmp, sizeof(zval )); \
	} while (0);
	#endif

	-typedef struct _amqp_channel_object {
	- zend_object zo;
	- zval *connection;
	- amqp_channel_t channel_id;
	- char is_connected;
	- int prefetch_count;
	- int prefetch_size;
	-} amqp_channel_object;
	-
	-typedef struct _amqp_connection_resource {
	- zend_bool is_connected;
	- int resource_id;
	- amqp_channel_t max_slots;
	- amqp_channel_t used_slots;
	- amqp_channel_object **slots;
	- char *resource_key;
	- int resource_key_len;
	- amqp_connection_state_t connection_state;
	- amqp_socket_t *socket;
	-} amqp_connection_resource;
	-
	-typedef struct _amqp_connection_object {
	- zend_object zo;
	- char is_connected;
	- char is_persistent;
	- char *login;
	- char *password;
	- char *host;
	- char *vhost;
	- int port;
	- int channel_max;
	- int frame_max;
	- int heartbeat;
	- double read_timeout;
	- double write_timeout;
	- double connect_timeout;
	- amqp_connection_resource *connection_resource;
	-} amqp_connection_object;
	-
	-typedef struct _amqp_queue_object {
	- zend_object zo;
	- zval *channel;
	- char name[256];
	- int name_len;
	- char consumer_tag[256];
	- int consumer_tag_len;
	- int flags;
	- zval *arguments;
	-} amqp_queue_object;
	-
	-typedef struct _amqp_exchange_object {
	- zend_object zo;
	- zval *channel;
	- char is_connected;
	- char name[256];
	- int name_len;
	- char type[256];
	- int type_len;
	- int flags;
	- zval *arguments;
	-} amqp_exchange_object;
	-
	-typedef struct _amqp_envelope_object {
	- zend_object zo;
	- char *body;
	- size_t body_len;
	- char routing_key[256];
	- uint delivery_tag;
	- int delivery_mode;
	- char exchange_name[256];
	- int is_redelivery;
	- char content_type[256];
	- char content_encoding[256];
	- char type[256];
	- long timestamp;
	- int priority;
	- char expiration[256];
	- char user_id[256];
	- char app_id[256];
	- char message_id[256];
	- char reply_to[256];
	- char correlation_id[256];
	- zval *headers;
	-} amqp_envelope_object;
	-

	#define AMQP_ERROR_CATEGORY_MASK (1 << 29)

	-#ifdef PHP_WIN32
	-# define AMQP_RPC_REPLY_T_CAST
	-#else
	-# define AMQP_RPC_REPLY_T_CAST (amqp_rpc_reply_t)
	-#endif
	-
	-#ifdef PHP_WIN32
	-# define AMQP_CLOSE_SOCKET(fd) closesocket(fd);
	-#else
	-# define AMQP_CLOSE_SOCKET(fd) close(fd);
	-#endif

	#ifdef PHP_WIN32
	# define AMQP_OS_SOCKET_TIMEOUT_ERRNO AMQP_ERROR_CATEGORY_MASK \| WSAETIMEDOUT
	#else
	# define AMQP_OS_SOCKET_TIMEOUT_ERRNO AMQP_ERROR_CATEGORY_MASK \| EAGAIN
	#endif


	#ifdef ZTS
	#define AMQP_G(v) TSRMG(amqp_globals_id, zend_amqp_globals *, v)
	#else
	#define AMQP_G(v) (amqp_globals.v)
	#endif

	#ifndef PHP_AMQP_VERSION
	-#define PHP_AMQP_VERSION "1.6.1"
	+#define PHP_AMQP_VERSION "1.7.0alpha1"
	#endif

	#ifndef PHP_AMQP_REVISION
	#define PHP_AMQP_REVISION "release"
	#endif

	-void php_amqp_error(amqp_rpc_reply_t reply, char *message, amqp_connection_object connection, amqp_channel_object *channel TSRMLS_DC);
	-void php_amqp_zend_throw_exception(amqp_rpc_reply_t reply, zend_class_entry exception_ce, const char message, long code TSRMLS_DC);
	+void php_amqp_error(amqp_rpc_reply_t reply, char *message, amqp_connection_resource connection_resource, amqp_channel_resource *channel_resource TSRMLS_DC);
	+void php_amqp_zend_throw_exception(amqp_rpc_reply_t reply, zend_class_entry exception_ce, const char message, PHP5to7_param_long_type_t code TSRMLS_DC);

	-void php_amqp_maybe_release_buffers_on_channel(amqp_connection_object connection, amqp_channel_object channel);
	+void php_amqp_maybe_release_buffers_on_channel(amqp_connection_resource connection_resource, amqp_channel_resource channel_resource);

	-amqp_bytes_t php_amqp_long_string(char const *cstr, int len);
	+amqp_bytes_t php_amqp_long_string(char const *cstr, PHP5to7_param_str_len_type_t len);

	#endif /* PHP_AMQP_H */


	/*
	* Local variables:
	* tab-width: 4
	* c-basic-offset: 4
	* End:
	* vim600: noet sw=4 ts=4 fdm=marker
	* vim<600: noet sw=4 ts=4
	*/
	diff --git a/amqp-1.7.0alpha1/stubs/AMQP.php b/amqp-1.7.0alpha1/stubs/AMQP.php
	new file mode 100644
	index 0000000..33de86a
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQP.php
	@@ -0,0 +1,125 @@
	+<?php
	+
	+/**
	+ * Passing in this constant as a flag will forcefully disable all other flags.
	+ * Use this if you want to temporarily disable the amqp.auto_ack ini setting.
	+ */
	+define('AMQP_NOPARAM', 0);
	+
	+/**
	+ * Passing in this constant as a flag to proper methods will forcefully ignore all other flags.
	+ * Do not send basic.consume request during AMQPQueue::consume(). Use this if you want to run callback on top of previously
	+ * declared consumers.
	+ */
	+define('AMQP_JUST_CONSUME', 1);
	+
	+/**
	+ * Durable exchanges and queues will survive a broker restart, complete with all of their data.
	+ */
	+define('AMQP_DURABLE', 2);
	+
	+/**
	+ * Passive exchanges and queues will not be redeclared, but the broker will throw an error if the exchange or queue does not exist.
	+ */
	+define('AMQP_PASSIVE', 4);
	+
	+/**
	+ * Valid for queues only, this flag indicates that only one client can be listening to and consuming from this queue.
	+ */
	+define('AMQP_EXCLUSIVE', 8);
	+
	+/**
	+ * For exchanges, the auto delete flag indicates that the exchange will be deleted as soon as no more queues are bound
	+ * to it. If no queues were ever bound the exchange, the exchange will never be deleted. For queues, the auto delete
	+ * flag indicates that the queue will be deleted as soon as there are no more listeners subscribed to it. If no
	+ * subscription has ever been active, the queue will never be deleted. Note: Exclusive queues will always be
	+ * automatically deleted with the client disconnects.
	+ */
	+define('AMQP_AUTODELETE', 16);
	+
	+/**
	+ * Clients are not allowed to make specific queue bindings to exchanges defined with this flag.
	+ */
	+define('AMQP_INTERNAL', 32);
	+
	+/**
	+ * When passed to the consume method for a clustered environment, do not consume from the local node.
	+ */
	+define('AMQP_NOLOCAL', 64);
	+
	+/**
	+ * When passed to the {@link AMQPQueue::get()} and {@link AMQPQueue::consume()} methods as a flag,
	+ * the messages will be immediately marked as acknowledged by the server upon delivery.
	+ */
	+define('AMQP_AUTOACK', 128);
	+
	+/**
	+ * Passed on queue creation, this flag indicates that the queue should be deleted if it becomes empty.
	+ */
	+define('AMQP_IFEMPTY', 256);
	+
	+/**
	+ * Passed on queue or exchange creation, this flag indicates that the queue or exchange should be
	+ * deleted when no clients are connected to the given queue or exchange.
	+ */
	+define('AMQP_IFUNUSED', 512);
	+
	+/**
	+ * When publishing a message, the message must be routed to a valid queue. If it is not, an error will be returned.
	+ */
	+define('AMQP_MANDATORY', 1024);
	+
	+/**
	+ * When publishing a message, mark this message for immediate processing by the broker. (High priority message.)
	+ */
	+define('AMQP_IMMEDIATE', 2048);
	+
	+/**
	+ * If set during a call to {@link AMQPQueue::ack()}, the delivery tag is treated as "up to and including", so that multiple
	+ * messages can be acknowledged with a single method. If set to zero, the delivery tag refers to a single message.
	+ * If the AMQP_MULTIPLE flag is set, and the delivery tag is zero, this indicates acknowledgement of all outstanding
	+ * messages.
	+ */
	+define('AMQP_MULTIPLE', 4096);
	+
	+/**
	+ * If set during a call to {@link AMQPExchange::bind()}, the server will not respond to the method.The client should not wait
	+ * for a reply method. If the server could not complete the method it will raise a channel or connection exception.
	+ */
	+define('AMQP_NOWAIT', 8192);
	+
	+/**
	+ * If set during a call to {@link AMQPQueue::nack()}, the message will be placed back to the queue.
	+ */
	+define('AMQP_REQUEUE', 16384);
	+
	+/**
	+ * A direct exchange type.
	+ */
	+define('AMQP_EX_TYPE_DIRECT', 'direct');
	+
	+/**
	+ * A fanout exchange type.
	+ */
	+define('AMQP_EX_TYPE_FANOUT', 'fanout');
	+
	+/**
	+ * A topic exchange type.
	+ */
	+define('AMQP_EX_TYPE_TOPIC', 'topic');
	+
	+/**
	+ * A header exchange type.
	+ */
	+define('AMQP_EX_TYPE_HEADERS', 'headers');
	+
	+/**
	+ *
	+ */
	+define('AMQP_OS_SOCKET_TIMEOUT_ERRNO', 536870947);
	+
	+
	+/**
	+ *
	+ */
	+define('PHP_AMQP_MAX_CHANNELS', 256);
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPChannel.php b/amqp-1.7.0alpha1/stubs/AMQPChannel.php
	new file mode 100644
	index 0000000..8b9c6e3
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPChannel.php
	@@ -0,0 +1,182 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPChannel from pecl-amqp
	+ */
	+class AMQPChannel
	+{
	+ /**
	+ * Commit a pending transaction.
	+ *
	+ * @throws AMQPChannelException If no transaction was started prior to
	+ * calling this method.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool TRUE on success or FALSE on failure.
	+ */
	+ public function commitTransaction()
	+ {
	+ }
	+
	+ /**
	+ * Create an instance of an AMQPChannel object.
	+ *
	+ * @param AMQPConnection $amqp_connection An instance of AMQPConnection
	+ * with an active connection to a
	+ * broker.
	+ *
	+ * @throws AMQPConnectionException If the connection to the broker
	+ * was lost.
	+ */
	+ public function __construct(AMQPConnection $amqp_connection)
	+ {
	+ }
	+
	+ /**
	+ * Check the channel connection.
	+ *
	+ * @return bool Indicates whether the channel is connected.
	+ */
	+ public function isConnected()
	+ {
	+ }
	+
	+ /**
	+ * Return internal channel ID
	+ *
	+ * @return integer
	+ */
	+ public function getChannelId()
	+ {
	+ }
	+
	+ /**
	+ * Set the Quality Of Service settings for the given channel.
	+ *
	+ * Specify the amount of data to prefetch in terms of window size (octets)
	+ * or number of messages from a queue during a AMQPQueue::consume() or
	+ * AMQPQueue::get() method call. The client will prefetch data up to size
	+ * octets or count messages from the server, whichever limit is hit first.
	+ * Setting either value to 0 will instruct the client to ignore that
	+ * particular setting. A call to AMQPChannel::qos() will overwrite any
	+ * values set by calling AMQPChannel::setPrefetchSize() and
	+ * AMQPChannel::setPrefetchCount(). If the call to either
	+ * AMQPQueue::consume() or AMQPQueue::get() is done with the AMQP_AUTOACK
	+ * flag set, the client will not do any prefetching of data, regardless of
	+ * the QOS settings.
	+ *
	+ * @param integer $size The window size, in octets, to prefetch.
	+ * @param integer $count The number of messages to prefetch.
	+ *
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool TRUE on success or FALSE on failure.
	+ */
	+ public function qos($size, $count)
	+ {
	+ }
	+
	+ /**
	+ * Rollback a transaction.
	+ *
	+ * Rollback an existing transaction. AMQPChannel::startTransaction() must
	+ * be called prior to this.
	+ *
	+ * @throws AMQPChannelException If no transaction was started prior to
	+ * calling this method.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool TRUE on success or FALSE on failure.
	+ */
	+ public function rollbackTransaction()
	+ {
	+ }
	+
	+ /**
	+ * Set the number of messages to prefetch from the broker.
	+ *
	+ * Set the number of messages to prefetch from the broker during a call to
	+ * AMQPQueue::consume() or AMQPQueue::get(). Any call to this method will
	+ * automatically set the prefetch window size to 0, meaning that the
	+ * prefetch window size setting will be ignored.
	+ *
	+ * @param integer $count The number of messages to prefetch.
	+ *
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setPrefetchCount($count)
	+ {
	+ }
	+
	+ /**
	+ * Get the number of messages to prefetch from the broker.
	+ *
	+ * @return integer
	+ */
	+ public function getPrefetchCount()
	+ {
	+ }
	+
	+ /**
	+ * Set the window size to prefetch from the broker.
	+ *
	+ * Set the prefetch window size, in octets, during a call to
	+ * AMQPQueue::consume() or AMQPQueue::get(). Any call to this method will
	+ * automatically set the prefetch message count to 0, meaning that the
	+ * prefetch message count setting will be ignored. If the call to either
	+ * AMQPQueue::consume() or AMQPQueue::get() is done with the AMQP_AUTOACK
	+ * flag set, this setting will be ignored.
	+ *
	+ * @param integer $size The window size, in octets, to prefetch.
	+ *
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool TRUE on success or FALSE on failure.
	+ */
	+ public function setPrefetchSize($size)
	+ {
	+ }
	+
	+ /**
	+ * Get the window size to prefetch from the broker.
	+ *
	+ * @return integer
	+ */
	+ public function getPrefetchSize()
	+ {
	+ }
	+
	+ /**
	+ * Start a transaction.
	+ *
	+ * This method must be called on the given channel prior to calling
	+ * AMQPChannel::commitTransaction() or AMQPChannel::rollbackTransaction().
	+ *
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool TRUE on success or FALSE on failure.
	+ */
	+ public function startTransaction()
	+ {
	+ }
	+
	+ /**
	+ * Get the AMQPConnection object in use
	+ *
	+ * @return AMQPConnection
	+ */
	+ public function getConnection()
	+ {
	+ }
	+
	+ /**
	+ * Redeliver unacknowledged messages.
	+ *
	+ * @param bool $requeue
	+ */
	+ public function basicRecover($requeue = true)
	+ {
	+ }
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPChannelException.php b/amqp-1.7.0alpha1/stubs/AMQPChannelException.php
	new file mode 100644
	index 0000000..390e3e5
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPChannelException.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPChannelException from pecl-amqp
	+ */
	+class AMQPChannelException extends AMQPException
	+{
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPConnection.php b/amqp-1.7.0alpha1/stubs/AMQPConnection.php
	new file mode 100644
	index 0000000..df064c3
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPConnection.php
	@@ -0,0 +1,347 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPConnection from pecl-amqp
	+ */
	+class AMQPConnection
	+{
	+ /**
	+ * Establish a transient connection with the AMQP broker.
	+ *
	+ * This method will initiate a connection with the AMQP broker.
	+ *
	+ * @throws AMQPConnectionException
	+ * @return boolean TRUE on success or throw an exception on failure.
	+ */
	+ public function connect()
	+ {
	+ }
	+
	+ /**
	+ * Create an instance of AMQPConnection.
	+ *
	+ * Creates an AMQPConnection instance representing a connection to an AMQP
	+ * broker. A connection will not be established until
	+ * AMQPConnection::connect() is called.
	+ *
	+ * $credentials = array(
	+ * 'host' => amqp.host The host to connect too. Note: Max 1024 characters.
	+ * 'port' => amqp.port Port on the host.
	+ * 'vhost' => amqp.vhost The virtual host on the host. Note: Max 128 characters.
	+ * 'login' => amqp.login The login name to use. Note: Max 128 characters.
	+ * 'password' => amqp.password Password. Note: Max 128 characters.
	+ * 'read_timeout' => Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
	+ * 'write_timeout' => Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.
	+ * 'connect_timeout' => Connection timeout. Note: 0 or greater seconds. May be fractional.
	+ *
	+ * Connection tuning options (see http://www.rabbitmq.com/amqp-0-9-1-reference.html#connection.tune for details):
	+ * 'channel_max' => Specifies highest channel number that the server permits. 0 means standard extension limit
	+ * (see PHP_AMQP_MAX_CHANNELS constant)
	+ * 'frame_max' => The largest frame size that the server proposes for the connection, including frame header
	+ * and end-byte. 0 means standard extension limit (depends on librabbimq default frame size limit)
	+ * 'heartbeat' => The delay, in seconds, of the connection heartbeat that the server wants.
	+ * 0 means the server does not want a heartbeat. Note, librabbitmq has limited heartbeat support,
	+ * which means heartbeats checked only during blocking calls.
	+ * )
	+ *
	+ * @param array $credentials Optional array of credential information for
	+ * connecting to the AMQP broker.
	+ */
	+ public function __construct(array $credentials = array())
	+ {
	+ }
	+
	+ /**
	+ * Closes the transient connection with the AMQP broker.
	+ *
	+ * This method will close an open connection with the AMQP broker.
	+ *
	+ * @return boolean true if connection was successfully closed, false otherwise.
	+ */
	+ public function disconnect()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured host.
	+ *
	+ * @return string The configured hostname of the broker
	+ */
	+ public function getHost()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured login.
	+ *
	+ * @return string The configured login as a string.
	+ */
	+ public function getLogin()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured password.
	+ *
	+ * @return string The configured password as a string.
	+ */
	+ public function getPassword()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured port.
	+ *
	+ * @return int The configured port as an integer.
	+ */
	+ public function getPort()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured vhost.
	+ *
	+ * @return string The configured virtual host as a string.
	+ */
	+ public function getVhost()
	+ {
	+ }
	+
	+ /**
	+ * Check whether the connection to the AMQP broker is still valid.
	+ *
	+ * It does so by checking the return status of the last connect-command.
	+ *
	+ * @return boolean True if connected, false otherwise.
	+ */
	+ public function isConnected()
	+ {
	+ }
	+
	+ /**
	+ * Establish a persistent connection with the AMQP broker.
	+ *
	+ * This method will initiate a connection with the AMQP broker
	+ * or reuse an existing one if present.
	+ *
	+ * @throws AMQPConnectionException
	+ * @return boolean TRUE on success or throws an exception on failure.
	+ */
	+ public function pconnect()
	+ {
	+ }
	+
	+ /**
	+ * Closes a persistent connection with the AMQP broker.
	+ *
	+ * This method will close an open persistent connection with the AMQP
	+ * broker.
	+ *
	+ * @return boolean true if connection was found and closed,
	+ * false if no persistent connection with this host,
	+ * port, vhost and login could be found,
	+ */
	+ public function pdisconnect()
	+ {
	+ }
	+
	+ /**
	+ * Close any open transient connections and initiate a new one with the AMQP broker.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function reconnect()
	+ {
	+ }
	+
	+ /**
	+ * Close any open persistent connections and initiate a new one with the AMQP broker.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function preconnect()
	+ {
	+ }
	+
	+
	+ /**
	+ * Set the hostname used to connect to the AMQP broker.
	+ *
	+ * @param string $host The hostname of the AMQP broker.
	+ *
	+ * @throws AMQPConnectionException If host is longer then 1024 characters.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setHost($host)
	+ {
	+ }
	+
	+ /**
	+ * Set the login string used to connect to the AMQP broker.
	+ *
	+ * @param string $login The login string used to authenticate
	+ * with the AMQP broker.
	+ *
	+ * @throws AMQPConnectionException If login is longer then 32 characters.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setLogin($login)
	+ {
	+ }
	+
	+ /**
	+ * Set the password string used to connect to the AMQP broker.
	+ *
	+ * @param string $password The password string used to authenticate
	+ * with the AMQP broker.
	+ *
	+ * @throws AMQPConnectionException If password is longer then 32characters.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setPassword($password)
	+ {
	+ }
	+
	+ /**
	+ * Set the port used to connect to the AMQP broker.
	+ *
	+ * @param integer $port The port used to connect to the AMQP broker.
	+ *
	+ * @throws AMQPConnectionException If port is longer not between
	+ * 1 and 65535.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setPort($port)
	+ {
	+ }
	+
	+ /**
	+ * Sets the virtual host to which to connect on the AMQP broker.
	+ *
	+ * @param string $vhost The virtual host to use on the AMQP
	+ * broker.
	+ *
	+ * @throws AMQPConnectionException If host is longer then 32 characters.
	+ *
	+ * @return boolean true on success or false on failure.
	+ */
	+ public function setVhost($vhost)
	+ {
	+ }
	+
	+ /**
	+ * Sets the interval of time to wait for income activity from AMQP broker
	+ *
	+ * @deprecated use AMQPConnection::setReadTimout($timeout) instead
	+ *
	+ * @param int $timeout
	+ *
	+ * @return bool
	+ */
	+ public function setTimeout($timeout)
	+ {
	+ }
	+
	+ /**
	+ * Get the configured interval of time to wait for income activity
	+ * from AMQP broker
	+ *
	+ * @deprecated use AMQPConnection::getReadTimout() instead
	+ *
	+ * @return float
	+ */
	+ public function getTimeout()
	+ {
	+ }
	+
	+ /**
	+ * Sets the interval of time to wait for income activity from AMQP broker
	+ *
	+ * @param int $timeout
	+ *
	+ * @return bool
	+ */
	+ public function setReadTimeout($timeout)
	+ {
	+ }
	+
	+ /**
	+ * Get the configured interval of time to wait for income activity
	+ * from AMQP broker
	+ *
	+ * @return float
	+ */
	+ public function getReadTimeout()
	+ {
	+ }
	+
	+ /**
	+ * Sets the interval of time to wait for outcome activity to AMQP broker
	+ *
	+ * @param int $timeout
	+ *
	+ * @return bool
	+ */
	+ public function setWriteTimeout($timeout)
	+ {
	+ }
	+
	+ /**
	+ * Get the configured interval of time to wait for outcome activity
	+ * to AMQP broker
	+ *
	+ * @return float
	+ */
	+ public function getWriteTimeout()
	+ {
	+ }
	+
	+ /**
	+ * Return last used channel id during current connection session.
	+ *
	+ * @return int
	+ */
	+ public function getUsedChannels()
	+ {
	+ }
	+
	+ /**
	+ * Get the maximum number of channels the connection can handle.
	+ *
	+ * @return int\|null
	+ */
	+ public function getMaxChannels()
	+ {
	+ }
	+
	+ /**
	+ * Get max supported frame size per connection in bytes.
	+ *
	+ * @return int\|null
	+ */
	+ public function getMaxFrameSize()
	+ {
	+ }
	+
	+ /**
	+ * Get number of seconds between heartbeats of the connection in seconds.
	+ *
	+ * @return int\|null
	+ */
	+ public function getHeartbeatInterval()
	+ {
	+ }
	+
	+ /**
	+ * Whether connection persistent.
	+ *
	+ * @return bool\|null
	+ */
	+ public function isPersistent()
	+ {
	+ }
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPConnectionException.php b/amqp-1.7.0alpha1/stubs/AMQPConnectionException.php
	new file mode 100644
	index 0000000..059104a
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPConnectionException.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPConnectionException from pecl-amqp
	+ */
	+class AMQPConnectionException extends AMQPException
	+{
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPEnvelope.php b/amqp-1.7.0alpha1/stubs/AMQPEnvelope.php
	new file mode 100644
	index 0000000..2071b20
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPEnvelope.php
	@@ -0,0 +1,197 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPEnvelope from pecl-amqp
	+ */
	+class AMQPEnvelope
	+{
	+ /**
	+ * Get the application id of the message.
	+ *
	+ * @return string The application id of the message.
	+ */
	+ public function getAppId()
	+ {
	+ }
	+
	+ /**
	+ * Get the body of the message.
	+ *
	+ * @return string The contents of the message body.
	+ */
	+ public function getBody()
	+ {
	+ }
	+
	+ /**
	+ * Get the content encoding of the message.
	+ *
	+ * @return string The content encoding of the message.
	+ */
	+ public function getContentEncoding()
	+ {
	+ }
	+
	+ /**
	+ * Get the message content type.
	+ *
	+ * @return string The content type of the message.
	+ */
	+ public function getContentType()
	+ {
	+ }
	+
	+ /**
	+ * Get the message correlation id.
	+ *
	+ * @return string The correlation id of the message.
	+ */
	+ public function getCorrelationId()
	+ {
	+ }
	+
	+ /**
	+ * Get the delivery mode of the message.
	+ *
	+ * @return integer The delivery mode of the message.
	+ */
	+ public function getDeliveryMode()
	+ {
	+ }
	+
	+ /**
	+ * Get the delivery tag of the message.
	+ *
	+ * @return string The delivery tag of the message.
	+ */
	+ public function getDeliveryTag()
	+ {
	+ }
	+
	+ /**
	+ * Get the exchange name on which the message was published.
	+ *
	+ * @return string The exchange name on which the message was published.
	+ */
	+ public function getExchangeName()
	+ {
	+ }
	+
	+ /**
	+ * Get the expiration of the message.
	+ *
	+ * @return string The message expiration.
	+ */
	+ public function getExpiration()
	+ {
	+ }
	+
	+ /**
	+ * Get a specific message header.
	+ *
	+ * @param string $header_key Name of the header to get the value from.
	+ *
	+ * @return string\|boolean The contents of the specified header or FALSE
	+ * if not set.
	+ */
	+ public function getHeader($header_key)
	+ {
	+ }
	+
	+ /**
	+ * Check whether specific message header exists.
	+ *
	+ * @param string $header_key Name of the header to check.
	+ *
	+ * @return boolean
	+ */
	+ public function hasHeader($header_key)
	+ {
	+ }
	+
	+ /**
	+ * Get the headers of the message.
	+ *
	+ * @return array An array of key value pairs associated with the message.
	+ */
	+ public function getHeaders()
	+ {
	+ }
	+
	+ /**
	+ * Get the message id of the message.
	+ *
	+ * @return string The message id
	+ */
	+ public function getMessageId()
	+ {
	+ }
	+
	+ /**
	+ * Get the priority of the message.
	+ *
	+ * @return int The message priority.
	+ */
	+ public function getPriority()
	+ {
	+ }
	+
	+ /**
	+ * Get the reply-to address of the message.
	+ *
	+ * @return string The contents of the reply to field.
	+ */
	+ public function getReplyTo()
	+ {
	+ }
	+
	+ /**
	+ * Get the routing key of the message.
	+ *
	+ * @return string The message routing key.
	+ */
	+ public function getRoutingKey()
	+ {
	+ }
	+
	+ /**
	+ * Get the timestamp of the message.
	+ *
	+ * @return string The message timestamp.
	+ */
	+ public function getTimeStamp()
	+ {
	+ }
	+
	+ /**
	+ * Get the message type.
	+ *
	+ * @return string The message type.
	+ */
	+ public function getType()
	+ {
	+ }
	+
	+ /**
	+ * Get the message user id.
	+ *
	+ * @return string The message user id.
	+ */
	+ public function getUserId()
	+ {
	+ }
	+
	+ /**
	+ * Whether this is a redelivery of the message.
	+ *
	+ * Whether this is a redelivery of a message. If this message has been
	+ * delivered and AMQPEnvelope::nack() was called, the message will be put
	+ * back on the queue to be redelivered, at which point the message will
	+ * always return TRUE when this method is called.
	+ *
	+ * @return bool TRUE if this is a redelivery, FALSE otherwise.
	+ */
	+ public function isRedelivery()
	+ {
	+ }
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPException.php b/amqp-1.7.0alpha1/stubs/AMQPException.php
	new file mode 100644
	index 0000000..b326f43
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPException.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPException from pecl-amqp
	+ */
	+class AMQPException extends Exception
	+{
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPExchange.php b/amqp-1.7.0alpha1/stubs/AMQPExchange.php
	new file mode 100644
	index 0000000..b24e2b8
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPExchange.php
	@@ -0,0 +1,262 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPExchange from pecl-amqp
	+ */
	+class AMQPExchange
	+{
	+ /**
	+ * Bind to another exchange.
	+ *
	+ * Bind an exchange to another exchange using the specified routing key.
	+ *
	+ * @param string $exchange_name Name of the exchange to bind.
	+ * @param string $routing_key The routing key to use for binding.
	+ * @param array $arguments Additional binding arguments.
	+ *
	+ * @throws AMQPExchangeException On failure.
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ * @return boolean true on success or false on failure.
	+ */
	+ public function bind($exchange_name, $routing_key = '', array $arguments = array())
	+ {
	+ }
	+
	+ /**
	+ * Remove binding to another exchange.
	+ *
	+ * Remove a routing key binding on an another exchange from the given exchange.
	+ *
	+ * @param string $exchange_name Name of the exchange to bind.
	+ * @param string $routing_key The routing key to use for binding.
	+ * @param array $arguments Additional binding arguments.
	+ *
	+ * @throws AMQPExchangeException On failure.
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ * @return boolean true on success or false on failure.
	+ */
	+ public function unbind($exchange_name, $routing_key = '', array $arguments = array())
	+ {
	+ }
	+
	+ /**
	+ * Create an instance of AMQPExchange.
	+ *
	+ * Returns a new instance of an AMQPExchange object, associated with the
	+ * given AMQPChannel object.
	+ *
	+ * @param AMQPChannel $amqp_channel A valid AMQPChannel object, connected
	+ * to a broker.
	+ *
	+ * @throws AMQPExchangeException When amqp_channel is not connected to
	+ * a broker.
	+ * @throws AMQPConnectionException If the connection to the broker was
	+ * lost.
	+ */
	+ public function __construct(AMQPChannel $amqp_channel)
	+ {
	+ }
	+
	+ /**
	+ * Declare a new exchange on the broker.
	+ *
	+ * @throws AMQPExchangeException On failure.
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function declareExchange()
	+ {
	+ }
	+
	+ /**
	+ * Delete the exchange from the broker.
	+ *
	+ * @param string $exchangeName Optional name of exchange to delete.
	+ * @param integer $flags Optionally AMQP_IFUNUSED can be specified
	+ * to indicate the exchange should not be
	+ * deleted until no clients are connected to
	+ * it.
	+ *
	+ * @throws AMQPExchangeException On failure.
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean true on success or false on failure.
	+ */
	+ public function delete($exchangeName = null, $flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Get the argument associated with the given key.
	+ *
	+ * @param string $key The key to look up.
	+ *
	+ * @return string\|integer\|boolean The string or integer value associated
	+ * with the given key, or FALSE if the key
	+ * is not set.
	+ */
	+ public function getArgument($key)
	+ {
	+ }
	+
	+ /**
	+ * Check whether argument associated with the given key exists.
	+ *
	+ * @param string $key The key to look up.
	+ *
	+ * @return bool
	+ */
	+ public function hasArgument($key)
	+ {
	+ }
	+ /**
	+ * Get all arguments set on the given exchange.
	+ *
	+ * @return array An array containing all of the set key/value pairs.
	+ */
	+ public function getArguments()
	+ {
	+ }
	+
	+ /**
	+ * Get all the flags currently set on the given exchange.
	+ *
	+ * @return int An integer bitmask of all the flags currently set on this
	+ * exchange object.
	+ */
	+ public function getFlags()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured name.
	+ *
	+ * @return string The configured name as a string.
	+ */
	+ public function getName()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured type.
	+ *
	+ * @return string The configured type as a string.
	+ */
	+ public function getType()
	+ {
	+ }
	+
	+ /**
	+ * Publish a message to an exchange.
	+ *
	+ * Publish a message to the exchange represented by the AMQPExchange object.
	+ *
	+ * @param string $message The message to publish.
	+ * @param string $routing_key The optional routing key to which to
	+ * publish to.
	+ * @param integer $flags One or more of AMQP_MANDATORY and
	+ * AMQP_IMMEDIATE.
	+ * @param array $attributes One of content_type, content_encoding,
	+ * message_id, user_id, app_id, delivery_mode,
	+ * priority, timestamp, expiration, type
	+ * or reply_to, headers.
	+ *
	+ * @throws AMQPExchangeException On failure.
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function publish(
	+ $message,
	+ $routing_key = null,
	+ $flags = AMQP_NOPARAM,
	+ array $attributes = array()
	+ ) {
	+ }
	+
	+ /**
	+ * Set the value for the given key.
	+ *
	+ * @param string $key Name of the argument to set.
	+ * @param string\|integer $value Value of the argument to set.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setArgument($key, $value)
	+ {
	+ }
	+
	+ /**
	+ * Set all arguments on the exchange.
	+ *
	+ * @param array $arguments An array of key/value pairs of arguments.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setArguments(array $arguments)
	+ {
	+ }
	+
	+ /**
	+ * Set the flags on an exchange.
	+ *
	+ * @param integer $flags A bitmask of flags. This call currently only
	+ * considers the following flags:
	+ * AMQP_DURABLE, AMQP_PASSIVE
	+ * (and AMQP_DURABLE, if librabbitmq version >= 0.5.3)
	+ *
	+ * @return boolean True on success or false on failure.
	+ */
	+ public function setFlags($flags)
	+ {
	+ }
	+
	+ /**
	+ * Set the name of the exchange.
	+ *
	+ * @param string $exchange_name The name of the exchange to set as string.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setName($exchange_name)
	+ {
	+ }
	+
	+ /**
	+ * Set the type of the exchange.
	+ *
	+ * Set the type of the exchange. This can be any of AMQP_EX_TYPE_DIRECT,
	+ * AMQP_EX_TYPE_FANOUT, AMQP_EX_TYPE_HEADERS or AMQP_EX_TYPE_TOPIC.
	+ *
	+ * @param string $exchange_type The type of exchange as a string.
	+ *
	+ * @return boolean TRUE on success or FALSE on failure.
	+ */
	+ public function setType($exchange_type)
	+ {
	+ }
	+
	+ /**
	+ * Get the AMQPChannel object in use
	+ *
	+ * @return AMQPChannel
	+ */
	+ public function getChannel()
	+ {
	+ }
	+
	+ /**
	+ * Get the AMQPConnection object in use
	+ *
	+ * @return AMQPConnection
	+ */
	+ public function getConnection()
	+ {
	+ }
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPExchangeException.php b/amqp-1.7.0alpha1/stubs/AMQPExchangeException.php
	new file mode 100644
	index 0000000..b52fb85
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPExchangeException.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPExchangeException from pecl-amqp
	+ */
	+class AMQPExchangeException extends AMQPException
	+{
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPQueue.php b/amqp-1.7.0alpha1/stubs/AMQPQueue.php
	new file mode 100644
	index 0000000..95d7135
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPQueue.php
	@@ -0,0 +1,386 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPQueue from pecl-amqp
	+ */
	+class AMQPQueue
	+{
	+ /**
	+ * Acknowledge the receipt of a message.
	+ *
	+ * This method allows the acknowledgement of a message that is retrieved
	+ * without the AMQP_AUTOACK flag through AMQPQueue::get() or
	+ * AMQPQueue::consume()
	+ *
	+ * @param string $delivery_tag The message delivery tag of which to
	+ * acknowledge receipt.
	+ * @param integer $flags The only valid flag that can be passed is
	+ * AMQP_MULTIPLE.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function ack($delivery_tag, $flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Bind the given queue to a routing key on an exchange.
	+ *
	+ * @param string $exchange_name Name of the exchange to bind to.
	+ * @param string $routing_key Pattern or routing key to bind with.
	+ * @param array $arguments Additional binding arguments.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function bind($exchange_name, $routing_key = null, array $arguments = array())
	+ {
	+ }
	+
	+ /**
	+ * Cancel a queue that is already bound to an exchange and routing key.
	+ *
	+ * @param string $consumer_tag The consumer tag cancel. If no tag provided,
	+ * or it is empty string, the latest consumer
	+ * tag on this queue will be used and after
	+ * successful request it will set to null.
	+ * If it also empty, no `basic.cancel`
	+ * request will be sent. When consumer_tag give
	+ * and it equals to latest consumer_tag on queue,
	+ * it will be interpreted as latest consumer_tag usage.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return bool;
	+ */
	+ public function cancel($consumer_tag = '')
	+ {
	+ }
	+
	+ /**
	+ * Create an instance of an AMQPQueue object.
	+ *
	+ * @param AMQPChannel $amqp_channel The amqp channel to use.
	+ *
	+ * @throws AMQPQueueException When amqp_channel is not connected to a
	+ * broker.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ */
	+ public function __construct(AMQPChannel $amqp_channel)
	+ {
	+ }
	+
	+ /**
	+ * Consume messages from a queue.
	+ *
	+ * Blocking function that will retrieve the next message from the queue as
	+ * it becomes available and will pass it off to the callback.
	+ *
	+ * @param callable \| null $callback A callback function to which the
	+ * consumed message will be passed. The
	+ * function must accept at a minimum
	+ * one parameter, an AMQPEnvelope object,
	+ * and an optional second parameter
	+ * the AMQPQueue object from which callback
	+ * was invoked. The AMQPQueue::consume() will
	+ * not return the processing thread back to
	+ * the PHP script until the callback
	+ * function returns FALSE.
	+ * If the callback is omitted or null is passed,
	+ * then the messages delivered to this client will
	+ * be made available to the first real callback
	+ * registered. That allows one to have a single
	+ * callback consuming from multiple queues.
	+ * @param integer $flags A bitmask of any of the flags: AMQP_AUTOACK,
	+ * AMQP_JUST_CONSUME. Note: when AMQP_JUST_CONSUME
	+ * flag used all other flags are ignored and
	+ * $consumerTag parameter has no sense.
	+ * AMQP_JUST_CONSUME flag prevent from sending
	+ * `basic.consume` request and just run $callback
	+ * if it provided. Calling method with empty $callback
	+ * and AMQP_JUST_CONSUME makes no sense.
	+ * @param string $consumerTag A string describing this consumer. Used
	+ * for canceling subscriptions with cancel().
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return void
	+ */
	+ public function consume(
	+ callable $callback = null,
	+ $flags = AMQP_NOPARAM,
	+ $consumerTag = null
	+ ) {
	+ }
	+
	+ /**
	+ * Declare a new queue on the broker.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return integer the message count.
	+ */
	+ public function declareQueue()
	+ {
	+ }
	+
	+ /**
	+ * Delete a queue from the broker.
	+ *
	+ * This includes its entire contents of unread or unacknowledged messages.
	+ *
	+ * @param integer $flags Optionally AMQP_IFUNUSED can be specified
	+ * to indicate the queue should not be
	+ * deleted until no clients are connected to
	+ * it.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return integer The number of deleted messages.
	+ */
	+ public function delete($flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Retrieve the next message from the queue.
	+ *
	+ * Retrieve the next available message from the queue. If no messages are
	+ * present in the queue, this function will return FALSE immediately. This
	+ * is a non blocking alternative to the AMQPQueue::consume() method.
	+ * Currently, the only supported flag for the flags parameter is
	+ * AMQP_AUTOACK. If this flag is passed in, then the message returned will
	+ * automatically be marked as acknowledged by the broker as soon as the
	+ * frames are sent to the client.
	+ *
	+ * @param integer $flags A bitmask of supported flags for the
	+ * method call. Currently, the only the
	+ * supported flag is AMQP_AUTOACK. If this
	+ * value is not provided, it will use the
	+ * value of ini-setting amqp.auto_ack.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return AMQPEnvelope\|boolean
	+ */
	+ public function get($flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Get the argument associated with the given key.
	+ *
	+ * @param string $key The key to look up.
	+ *
	+ * @return string\|integer\|boolean The string or integer value associated
	+ * with the given key, or false if the key
	+ * is not set.
	+ */
	+ public function getArgument($key)
	+ {
	+ }
	+
	+ /**
	+ * Get all set arguments as an array of key/value pairs.
	+ *
	+ * @return array An array containing all of the set key/value pairs.
	+ */
	+ public function getArguments()
	+ {
	+ }
	+
	+ /**
	+ * Get all the flags currently set on the given queue.
	+ *
	+ * @return int An integer bitmask of all the flags currently set on this
	+ * exchange object.
	+ */
	+ public function getFlags()
	+ {
	+ }
	+
	+ /**
	+ * Get the configured name.
	+ *
	+ * @return string The configured name as a string.
	+ */
	+ public function getName()
	+ {
	+ }
	+
	+ /**
	+ * Mark a message as explicitly not acknowledged.
	+ *
	+ * Mark the message identified by delivery_tag as explicitly not
	+ * acknowledged. This method can only be called on messages that have not
	+ * yet been acknowledged, meaning that messages retrieved with by
	+ * AMQPQueue::consume() and AMQPQueue::get() and using the AMQP_AUTOACK
	+ * flag are not eligible. When called, the broker will immediately put the
	+ * message back onto the queue, instead of waiting until the connection is
	+ * closed. This method is only supported by the RabbitMQ broker. The
	+ * behavior of calling this method while connected to any other broker is
	+ * undefined.
	+ *
	+ * @param string $delivery_tag Delivery tag of last message to reject.
	+ * @param integer $flags AMQP_REQUEUE to requeue the message(s),
	+ * AMQP_MULTIPLE to nack all previous
	+ * unacked messages as well.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function nack($delivery_tag, $flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Mark one message as explicitly not acknowledged.
	+ *
	+ * Mark the message identified by delivery_tag as explicitly not
	+ * acknowledged. This method can only be called on messages that have not
	+ * yet been acknowledged, meaning that messages retrieved with by
	+ * AMQPQueue::consume() and AMQPQueue::get() and using the AMQP_AUTOACK
	+ * flag are not eligible.
	+ *
	+ * @param string $delivery_tag Delivery tag of the message to reject.
	+ * @param integer $flags AMQP_REQUEUE to requeue the message(s).
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function reject($delivery_tag, $flags = AMQP_NOPARAM)
	+ {
	+ }
	+
	+ /**
	+ * Purge the contents of a queue.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function purge()
	+ {
	+ }
	+
	+ /**
	+ * Set a queue argument.
	+ *
	+ * @param string $key The key to set.
	+ * @param mixed $value The value to set.
	+ *
	+ * @return boolean
	+ */
	+ public function setArgument($key, $value)
	+ {
	+ }
	+
	+ /**
	+ * Set all arguments on the given queue.
	+ *
	+ * All other argument settings will be wiped.
	+ *
	+ * @param array $arguments An array of key/value pairs of arguments.
	+ *
	+ * @return boolean
	+ */
	+ public function setArguments(array $arguments)
	+ {
	+ }
	+
	+ /**
	+ * Check whether a queue has specific argument.
	+ *
	+ * @param string $key The key to check.
	+ *
	+ * @return boolean
	+ */
	+ public function hasArgument($key)
	+ {
	+ }
	+
	+ /**
	+ * Set the flags on the queue.
	+ *
	+ * @param integer $flags A bitmask of flags:
	+ * AMQP_DURABLE, AMQP_PASSIVE,
	+ * AMQP_EXCLUSIVE, AMQP_AUTODELETE.
	+ *
	+ * @return boolean
	+ */
	+ public function setFlags($flags)
	+ {
	+ }
	+
	+ /**
	+ * Set the queue name.
	+ *
	+ * @param string $queue_name The name of the queue.
	+ *
	+ * @return boolean
	+ */
	+ public function setName($queue_name)
	+ {
	+ }
	+
	+ /**
	+ * Remove a routing key binding on an exchange from the given queue.
	+ *
	+ * @param string $exchange_name The name of the exchange on which the
	+ * queue is bound.
	+ * @param string $routing_key The binding routing key used by the
	+ * queue.
	+ * @param array $arguments Additional binding arguments.
	+ *
	+ * @throws AMQPChannelException If the channel is not open.
	+ * @throws AMQPConnectionException If the connection to the broker was lost.
	+ *
	+ * @return boolean
	+ */
	+ public function unbind($exchange_name, $routing_key = null, array $arguments = array())
	+ {
	+ }
	+
	+ /**
	+ * Get the AMQPChannel object in use
	+ *
	+ * @return AMQPChannel
	+ */
	+ public function getChannel()
	+ {
	+ }
	+
	+ /**
	+ * Get the AMQPConnection object in use
	+ *
	+ * @return AMQPConnection
	+ */
	+ public function getConnection()
	+ {
	+ }
	+
	+ /**
	+ * Get latest consumer tag. If no consumer available or the latest on was canceled null will be returned.
	+ *
	+ * @return string \| null
	+ */
	+ public function getConsumerTag()
	+ {
	+ }
	+
	+}
	diff --git a/amqp-1.7.0alpha1/stubs/AMQPQueueException.php b/amqp-1.7.0alpha1/stubs/AMQPQueueException.php
	new file mode 100644
	index 0000000..3b9f58a
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/stubs/AMQPQueueException.php
	@@ -0,0 +1,8 @@
	+<?php
	+
	+/**
	+ * stub class representing AMQPQueueException from pecl-amqp
	+ */
	+class AMQPQueueException extends AMQPException
	+{
	+}
	diff --git a/amqp-1.7.0alpha1/tests/_test_helpers.php.inc b/amqp-1.7.0alpha1/tests/_test_helpers.php.inc
	new file mode 100644
	index 0000000..d953d3c
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/_test_helpers.php.inc
	@@ -0,0 +1,53 @@
	+<?php
	+
	+function dump_message($msg) {
	+ if (!$msg) {
	+ var_dump($msg);
	+ return false;
	+ }
	+
	+ echo get_class($msg), PHP_EOL;
	+ echo " getBody:", PHP_EOL, " ";
	+ var_dump($msg->getBody());
	+ echo " getContentType:", PHP_EOL, " ";
	+ var_dump($msg->getContentType());
	+ echo " getRoutingKey:", PHP_EOL, " ";
	+ var_dump($msg->getRoutingKey());
	+ echo " getDeliveryTag:", PHP_EOL, " ";
	+ var_dump($msg->getDeliveryTag());
	+ echo " getDeliveryMode:", PHP_EOL, " ";
	+ var_dump($msg->getDeliveryMode());
	+ echo " getExchangeName:", PHP_EOL, " ";
	+ var_dump($msg->getExchangeName());
	+ echo " isRedelivery:", PHP_EOL, " ";
	+ var_dump($msg->isRedelivery());
	+ echo " getContentEncoding:", PHP_EOL, " ";
	+ var_dump($msg->getContentEncoding());
	+ echo " getType:", PHP_EOL, " ";
	+ var_dump($msg->getType());
	+ echo " getTimeStamp:", PHP_EOL, " ";
	+ var_dump($msg->getTimeStamp());
	+ echo " getPriority:", PHP_EOL, " ";
	+ var_dump($msg->getPriority());
	+ echo " getExpiration:", PHP_EOL, " ";
	+ var_dump($msg->getExpiration());
	+ echo " getUserId:", PHP_EOL, " ";
	+ var_dump($msg->getUserId());
	+ echo " getAppId:", PHP_EOL, " ";
	+ var_dump($msg->getAppId());
	+ echo " getMessageId:", PHP_EOL, " ";
	+ var_dump($msg->getMessageId());
	+ echo " getReplyTo:", PHP_EOL, " ";
	+ var_dump($msg->getReplyTo());
	+ echo " getCorrelationId:", PHP_EOL, " ";
	+ var_dump($msg->getCorrelationId());
	+ echo " getHeaders:", PHP_EOL, " ";
	+ var_dump($msg->getHeaders());
	+
	+ return false;
	+}
	+
	+function consumeThings($message, $queue) {
	+ var_dump($message);
	+ return false;
	+}
	diff --git a/amqp-1.6.1/tests/amqpchannel_basicRecover.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_basicRecover.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpchannel_basicRecover.phpt
	rename to amqp-1.7.0alpha1/tests/amqpchannel_basicRecover.phpt
	diff --git a/amqp-1.6.1/tests/amqpchannel_construct_basic.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_construct_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpchannel_construct_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpchannel_construct_basic.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpchannel_getChannelId.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_getChannelId.phpt
	new file mode 100644
	index 0000000..0990b63
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpchannel_getChannelId.phpt
	@@ -0,0 +1,23 @@
	+--TEST--
	+AMQPChannel::getChannelId
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+
	+var_dump($ch->getChannelId());
	+
	+$cnn->disconnect();
	+var_dump($ch->getChannelId());
	+
	+?>
	+--EXPECT--
	+int(1)
	+int(1)
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpchannel_get_connection.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_get_connection.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpchannel_get_connection.phpt
	rename to amqp-1.7.0alpha1/tests/amqpchannel_get_connection.phpt
	diff --git a/amqp-1.6.1/tests/amqpchannel_multi_channel_connection.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_multi_channel_connection.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpchannel_multi_channel_connection.phpt
	rename to amqp-1.7.0alpha1/tests/amqpchannel_multi_channel_connection.phpt
	diff --git a/amqp-1.6.1/tests/amqpchannel_slots_usage.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_slots_usage.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpchannel_slots_usage.phpt
	rename to amqp-1.7.0alpha1/tests/amqpchannel_slots_usage.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpchannel_var_dump.phpt b/amqp-1.7.0alpha1/tests/amqpchannel_var_dump.phpt
	new file mode 100644
	index 0000000..589cab7
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpchannel_var_dump.phpt
	@@ -0,0 +1,82 @@
	+--TEST--
	+AMQPChannel var_dump
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+
	+var_dump($ch);
	+$cnn->disconnect();
	+var_dump($ch);
	+
	+?>
	+--EXPECT--
	+object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+}
	+object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+}
	diff --git a/amqp-1.6.1/tests/amqpconnection_connect_login_failure.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_connect_login_failure.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_connect_login_failure.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_connect_login_failure.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_basic.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_basic.phpt
	similarity index 64%
	rename from amqp-1.6.1/tests/amqpconnection_construct_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_basic.phpt
	index b379f82..087eb0f 100644
	--- a/amqp-1.6.1/tests/amqpconnection_construct_basic.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_construct_basic.phpt
	@@ -1,14 +1,16 @@
	--TEST--
	AMQPConnection constructor
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->connect();
	echo get_class($cnn) . "\n";
	-echo $cnn->isConnected() ? 'true' : 'false';
	+echo $cnn->isConnected() ? 'true' : 'false', PHP_EOL;
	+echo $cnn->isPersistent() ? 'true' : 'false', PHP_EOL;
	?>
	--EXPECT--
	AMQPConnection
	-true
	\ No newline at end of file
	+true
	+false
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_ini_read_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_read_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_ini_read_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_read_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_ini_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_ini_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_ini_timeout_default.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout_default.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_ini_timeout_default.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_ini_timeout_default.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_with_connect_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_connect_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_with_connect_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_with_connect_timeout.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_limits.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_limits.phpt
	new file mode 100644
	index 0000000..7494f5f
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_limits.phpt
	@@ -0,0 +1,41 @@
	+--TEST--
	+AMQPConnection constructor with channel_max, frame_max and heartbeat limits
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$credentials = array(
	+ 'channel_max' => 10,
	+ 'frame_max' => 10240,
	+ 'heartbeat' => 5,
	+);
	+$cnn = new AMQPConnection($credentials);
	+$cnn->connect();
	+
	+var_dump($cnn);
	+?>
	+--EXPECTF--
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(10)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(10240)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(5)
	+}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_with_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_with_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_with_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_construct_with_write_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_construct_with_write_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_construct_with_write_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_construct_with_write_timeout.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpconnection_getUsedChannels.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_getUsedChannels.phpt
	new file mode 100644
	index 0000000..17fa5aa
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_getUsedChannels.phpt
	@@ -0,0 +1,25 @@
	+--TEST--
	+AMQPConnection::getUsedChannels()
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+echo get_class($cnn), '::getUsedChannels():', $cnn->getUsedChannels(), PHP_EOL;
	+$cnn->connect();
	+echo get_class($cnn), '::getUsedChannels():', $cnn->getUsedChannels(), PHP_EOL;
	+
	+$ch = new AMQPChannel($cnn);
	+echo get_class($cnn), '::getUsedChannels():', $cnn->getUsedChannels(), PHP_EOL;
	+
	+$ch = null;
	+echo get_class($cnn), '::getUsedChannels():', $cnn->getUsedChannels(), PHP_EOL;
	+
	+?>
	+--EXPECTF--
	+AMQPConnection::getUsedChannels():
	+Warning: AMQPConnection::getUsedChannels(): Connection is not connected. in %s on line %d
	+0
	+AMQPConnection::getUsedChannels():0
	+AMQPConnection::getUsedChannels():1
	+AMQPConnection::getUsedChannels():0
	diff --git a/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat.phpt
	new file mode 100644
	index 0000000..3f53224
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat.phpt
	@@ -0,0 +1,49 @@
	+--TEST--
	+AMQPConnection heartbeats support
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$heartbeat = 2;
	+$credentials = array('heartbeat' => $heartbeat);
	+$cnn = new AMQPConnection($credentials);
	+$cnn->connect();
	+
	+var_dump($cnn);
	+
	+sleep($heartbeat*10);
	+
	+try {
	+$ch = new AMQPChannel($cnn);
	+
	+} catch (AMQPException $e) {
	+ echo get_class($e), ': ', $e->getMessage(), PHP_EOL;
	+}
	+
	+?>
	+--EXPECTF--
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(2)
	+}
	+AMQPException: Library error: a socket error occurred
	\ No newline at end of file
	diff --git a/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat_with_consumer.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat_with_consumer.phpt
	new file mode 100644
	index 0000000..8da1398
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_heartbeat_with_consumer.phpt
	@@ -0,0 +1,90 @@
	+--TEST--
	+AMQPConnection heartbeats support (with active consumer)
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$heartbeat = 2;
	+$credentials = array('heartbeat' => $heartbeat, 'read_timeout' => $heartbeat * 20);
	+$cnn = new AMQPConnection($credentials);
	+$cnn->connect();
	+
	+var_dump($cnn);
	+
	+$ch = new AMQPChannel($cnn);
	+
	+$q_dead_name = 'test.queue.dead.' . microtime(true);
	+$q_name = 'test.queue.' . microtime(true);
	+
	+$e = new AMQPExchange($ch);
	+
	+$q = new AMQPQueue($ch);
	+$q->setName($q_name);
	+$q->declareQueue();
	+
	+
	+$q_dead = new AMQPQueue($ch);
	+$q_dead->setName($q_dead_name);
	+$q_dead->setArgument('x-dead-letter-exchange', '');
	+$q_dead->setArgument('x-dead-letter-routing-key', $q_name);
	+$q_dead->setArgument('x-message-ttl', $heartbeat * 10 * 1000);
	+$q_dead->declareQueue();
	+
	+$e->publish('test message 1 (should be dead lettered)', $q_dead_name);
	+
	+$t = microtime(true);
	+$q->consume(function (AMQPEnvelope $envelope) {
	+ echo 'Consumed: ', $envelope->getBody(), PHP_EOL;
	+ return false;
	+});
	+$t = microtime(true) - $t;
	+
	+echo 'Consuming took: ', (float) round($t, 4), 'sec', PHP_EOL;
	+
	+$t_min = (float)round($heartbeat * 9.5, 4);
	+$t_max = (float)round($heartbeat * 10.5, 4);
	+
	+if ($t > $t_min && $t < $t_max) {
	+ echo "Timing OK ($t_min < $t < $t_max)", PHP_EOL;
	+} else {
	+ echo "Timing ERROR ($t_min < $t < $t_max)", PHP_EOL;
	+}
	+
	+$ch2 = new AMQPChannel($cnn);
	+
	+sleep($heartbeat/2);
	+
	+$ch3 = new AMQPChannel($cnn);
	+
	+echo 'Done', PHP_EOL
	+
	+?>
	+--EXPECTF--
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(40)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(2)
	+}
	+Consumed: test message 1 (should be dead lettered)
	+Consuming took: %fsec
	+Timing OK (%f < %f < %f)
	+Done
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpconnection_persistent_construct_basic.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_persistent_construct_basic.phpt
	similarity index 67%
	rename from amqp-1.6.1/tests/amqpconnection_persistent_construct_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_persistent_construct_basic.phpt
	index 57dcfb0..71929bd 100644
	--- a/amqp-1.6.1/tests/amqpconnection_persistent_construct_basic.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_persistent_construct_basic.phpt
	@@ -1,14 +1,16 @@
	--TEST--
	AMQPConnection persitent constructor
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->pconnect();
	echo get_class($cnn) . "\n";
	-echo $cnn->isConnected() ? 'true' : 'false';
	+echo $cnn->isConnected() ? 'true' : 'false', PHP_EOL;
	+echo $cnn->isPersistent() ? 'true' : 'false', PHP_EOL;
	?>
	--EXPECT--
	AMQPConnection
	+true
	true
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpconnection_persistent_in_use.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_persistent_in_use.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_persistent_in_use.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_persistent_in_use.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_persistent_reusable.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_persistent_reusable.phpt
	similarity index 61%
	rename from amqp-1.6.1/tests/amqpconnection_persistent_reusable.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_persistent_reusable.phpt
	index 53118a2..6962771 100644
	--- a/amqp-1.6.1/tests/amqpconnection_persistent_reusable.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_persistent_reusable.phpt
	@@ -1,28 +1,46 @@
	--TEST--
	AMQPConnection persistent connection are reusable
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	+$manual = false; // set to true when you want to check via RabbitMQ Management panel that connection really persists.
	+
	$cnn = new AMQPConnection();
	$cnn->pconnect();
	echo get_class($cnn), PHP_EOL;
	echo $cnn->isConnected() ? 'true' : 'false', PHP_EOL;

	+if ($manual) {
	+ $ch = new AMQPChannel($cnn);
	+ sleep(10);
	+ $ch = null;
	+}
	+
	$cnn = null;
	echo PHP_EOL;

	+if ($manual) {
	+ sleep(10);
	+}
	+
	$cnn = new AMQPConnection();
	$cnn->pconnect();
	echo get_class($cnn), PHP_EOL;
	echo $cnn->isConnected() ? 'true' : 'false', PHP_EOL;

	+if ($manual) {
	+ $ch = new AMQPChannel($cnn);
	+ sleep(10);
	+ $ch = null;
	+}
	+
	$cnn->pdisconnect();

	?>
	--EXPECT--
	AMQPConnection
	true

	AMQPConnection
	true
	diff --git a/amqp-1.6.1/tests/amqpconnection_setHost.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setHost.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setHost.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setHost.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setLogin.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setLogin.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setLogin.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setLogin.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setPassword.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setPassword.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setPassword.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setPassword.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setPort_int.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setPort_int.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setPort_int.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setPort_int.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setPort_out_of_range.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setPort_out_of_range.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setPort_out_of_range.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setPort_out_of_range.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setPort_string.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setPort_string.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setPort_string.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setPort_string.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setReadTimeout_float.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_float.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setReadTimeout_float.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_float.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setReadTimeout_int.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_int.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setReadTimeout_int.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_int.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setReadTimeout_out_of_range.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_out_of_range.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setReadTimeout_out_of_range.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_out_of_range.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setReadTimeout_string.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_string.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setReadTimeout_string.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setReadTimeout_string.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setTimeout_deprecated.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_deprecated.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setTimeout_deprecated.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_deprecated.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setTimeout_float.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_float.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setTimeout_float.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_float.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setTimeout_int.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_int.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setTimeout_int.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_int.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setTimeout_out_of_range.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_out_of_range.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setTimeout_out_of_range.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_out_of_range.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setTimeout_string.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_string.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setTimeout_string.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setTimeout_string.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setVhost.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setVhost.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setVhost.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setVhost.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setWriteTimeout_float.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_float.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setWriteTimeout_float.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_float.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setWriteTimeout_int.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_int.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setWriteTimeout_int.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_int.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setWriteTimeout_out_of_range.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_setWriteTimeout_string.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_string.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_setWriteTimeout_string.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_setWriteTimeout_string.phpt
	diff --git a/amqp-1.6.1/tests/amqpconnection_toomanychannels.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_toomanychannels.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpconnection_toomanychannels.phpt
	rename to amqp-1.7.0alpha1/tests/amqpconnection_toomanychannels.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpconnection_var_dump.phpt b/amqp-1.7.0alpha1/tests/amqpconnection_var_dump.phpt
	new file mode 100644
	index 0000000..419a55f
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpconnection_var_dump.phpt
	@@ -0,0 +1,100 @@
	+--TEST--
	+AMQPConnection var_dump
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+var_dump($cnn->isConnected());
	+var_dump($cnn);
	+$cnn->connect();
	+var_dump($cnn->isConnected());
	+$cnn->connect();
	+var_dump($cnn->isConnected());
	+var_dump($cnn);
	+
	+$cnn->disconnect();
	+var_dump($cnn->isConnected());
	+var_dump($cnn);
	+?>
	+--EXPECT--
	+bool(false)
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+}
	+bool(true)
	+bool(true)
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+}
	+bool(false)
	+object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+}
	diff --git a/amqp-1.7.0alpha1/tests/amqpenvelope_construct.phpt b/amqp-1.7.0alpha1/tests/amqpenvelope_construct.phpt
	new file mode 100644
	index 0000000..4066f63
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpenvelope_construct.phpt
	@@ -0,0 +1,51 @@
	+--TEST--
	+AMQPEnvelope construct
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+--FILE--
	+<?php
	+var_dump(new AMQPEnvelope());
	+?>
	+--EXPECT--
	+object(AMQPEnvelope)#1 (18) {
	+ ["body":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["delivery_tag":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["is_redelivery":"AMQPEnvelope":private]=>
	+ bool(false)
	+ ["exchange_name":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["routing_key":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["content_type":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["content_encoding":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["headers":"AMQPEnvelope":private]=>
	+ array(0) {
	+ }
	+ ["delivery_mode":"AMQPEnvelope":private]=>
	+ int(1)
	+ ["priority":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["correlation_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["reply_to":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["expiration":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["message_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["timestamp":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["type":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["user_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["app_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpenvelope_get_accessors.phpt b/amqp-1.7.0alpha1/tests/amqpenvelope_get_accessors.phpt
	similarity index 78%
	rename from amqp-1.6.1/tests/amqpenvelope_get_accessors.phpt
	rename to amqp-1.7.0alpha1/tests/amqpenvelope_get_accessors.phpt
	index 1f0ef06..9a99a1c 100644
	--- a/amqp-1.6.1/tests/amqpenvelope_get_accessors.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpenvelope_get_accessors.phpt
	@@ -1,67 +1,79 @@
	--TEST--
	AMQPEnvelope test get*() accessors
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	-require '_test_helpers.php';
	+require '_test_helpers.php.inc';

	$cnn = new AMQPConnection();
	$cnn->connect();
	$ch = new AMQPChannel($cnn);
	// Declare a new exchange
	$ex = new AMQPExchange($ch);
	$ex->setName('exchange-'.microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();
	// Create a new queue
	$q = new AMQPQueue($ch);
	$q->setName('queue1' . microtime(true));
	$q->declareQueue();
	// Bind it on the exchange to routing.key
	$q->bind($ex->getName(), 'routing.*');
	// Publish a message to the exchange with a routing key
	-$ex->publish('message', 'routing.1');
	+$ex->publish('message', 'routing.1', AMQP_NOPARAM, array('headers' => array('foo' => 'bar')));

	// Read from the queue
	-$q->consume('dump_message');
	+$msg = $q->get();
	+dump_message($msg);
	+
	+$header = $msg->getHeader('foo');
	+var_dump($header);
	+$header = 'changed';
	+$header = $msg->getHeader('foo');
	+var_dump($header);
	+
	?>
	--EXPECTF--
	AMQPEnvelope
	getBody:
	string(7) "message"
	getContentType:
	string(10) "text/plain"
	getRoutingKey:
	string(9) "routing.1"
	getDeliveryTag:
	int(1)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	- array(0) {
	-}
	\ No newline at end of file
	+ array(1) {
	+ ["foo"]=>
	+ string(3) "bar"
	+}
	+string(3) "bar"
	+string(3) "bar"
	\ No newline at end of file
	diff --git a/amqp-1.7.0alpha1/tests/amqpenvelope_var_dump.phpt b/amqp-1.7.0alpha1/tests/amqpenvelope_var_dump.phpt
	new file mode 100644
	index 0000000..bb22fd6
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpenvelope_var_dump.phpt
	@@ -0,0 +1,114 @@
	+--TEST--
	+AMQPEnvelope var_dump
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+--FILE--
	+<?php
	+require '_test_helpers.php.inc';
	+
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+// Declare a new exchange
	+$ex = new AMQPExchange($ch);
	+$ex->setName('exchange1');
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+$ex->declareExchange();
	+// Create a new queue
	+$q = new AMQPQueue($ch);
	+$q->setName('queue1' . microtime(true));
	+$q->declareQueue();
	+// Bind it on the exchange to routing.key
	+$q->bind($ex->getName(), 'routing.*');
	+// Publish a message to the exchange with a routing key
	+$ex->publish('message', 'routing.1');
	+$ex->publish('message', 'routing.1', AMQP_NOPARAM, array("headers" => array("test" => "passed")));
	+
	+// Read from the queue
	+$q->consume("consumeThings");
	+$q->consume("consumeThings");
	+?>
	+--EXPECTF--
	+object(AMQPEnvelope)#5 (18) {
	+ ["body":"AMQPEnvelope":private]=>
	+ string(7) "message"
	+ ["delivery_tag":"AMQPEnvelope":private]=>
	+ int(1)
	+ ["is_redelivery":"AMQPEnvelope":private]=>
	+ bool(false)
	+ ["exchange_name":"AMQPEnvelope":private]=>
	+ string(9) "exchange1"
	+ ["routing_key":"AMQPEnvelope":private]=>
	+ string(9) "routing.1"
	+ ["content_type":"AMQPEnvelope":private]=>
	+ string(10) "text/plain"
	+ ["content_encoding":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["headers":"AMQPEnvelope":private]=>
	+ array(0) {
	+ }
	+ ["delivery_mode":"AMQPEnvelope":private]=>
	+ int(1)
	+ ["priority":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["correlation_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["reply_to":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["expiration":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["message_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["timestamp":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["type":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["user_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["app_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+}
	+object(AMQPEnvelope)#%d (18) {
	+ ["body":"AMQPEnvelope":private]=>
	+ string(7) "message"
	+ ["delivery_tag":"AMQPEnvelope":private]=>
	+ int(2)
	+ ["is_redelivery":"AMQPEnvelope":private]=>
	+ bool(false)
	+ ["exchange_name":"AMQPEnvelope":private]=>
	+ string(9) "exchange1"
	+ ["routing_key":"AMQPEnvelope":private]=>
	+ string(9) "routing.1"
	+ ["content_type":"AMQPEnvelope":private]=>
	+ string(10) "text/plain"
	+ ["content_encoding":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["headers":"AMQPEnvelope":private]=>
	+ array(1) {
	+ ["test"]=>
	+ string(6) "passed"
	+ }
	+ ["delivery_mode":"AMQPEnvelope":private]=>
	+ int(1)
	+ ["priority":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["correlation_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["reply_to":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["expiration":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["message_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["timestamp":"AMQPEnvelope":private]=>
	+ int(0)
	+ ["type":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["user_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+ ["app_id":"AMQPEnvelope":private]=>
	+ string(0) ""
	+}
	\ No newline at end of file
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_attributes.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_attributes.phpt
	new file mode 100644
	index 0000000..0dc721c
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_attributes.phpt
	@@ -0,0 +1,28 @@
	+--TEST--
	+AMQPExchange attributes
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+
	+$ex = new AMQPExchange($ch);
	+
	+$ex->setArguments(array('existent' => 'value', 'false' => false));
	+
	+foreach (array('existent', 'false', 'nonexistent') as $key) {
	+ echo "$key: ", var_export($ex->hasArgument($key), true), ', ', var_export($ex->getArgument($key)), PHP_EOL;
	+}
	+
	+?>
	+--EXPECT--
	+existent: true, 'value'
	+false: true, false
	+nonexistent: false, false
	diff --git a/amqp-1.6.1/tests/amqpexchange_bind.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_bind.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_bind.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_bind.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_bind_with_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_bind_with_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_bind_with_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_bind_with_arguments.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_bind_without_key.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_bind_without_key.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_bind_without_key.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_bind_without_key.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_bind_without_key_with_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_bind_without_key_with_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_bind_without_key_with_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_bind_without_key_with_arguments.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_channel_refcount.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_channel_refcount.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_channel_refcount.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_channel_refcount.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_construct_basic.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_construct_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_construct_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_construct_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_declare_basic.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_declare_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_declare_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_declare_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_declare_existent.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_declare_existent.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_declare_existent.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_declare_existent.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_name.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_name.phpt
	new file mode 100644
	index 0000000..674ed82
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_name.phpt
	@@ -0,0 +1,24 @@
	+--TEST--
	+AMQPExchange::declareExchange() without name set
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+
	+$ch = new AMQPChannel($cnn);
	+
	+
	+$ex = new AMQPExchange($ch);
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+
	+try {
	+ $ex->declareExchange();
	+ echo 'Exchange declared', PHP_EOL;
	+} catch (AMQPException $e) {
	+ echo get_class($e), ': ', $e->getMessage(), PHP_EOL;
	+}
	+?>
	+--EXPECTF--
	+AMQPExchangeException: Could not declare exchange. Exchanges must have a name.
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_type.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_type.phpt
	new file mode 100644
	index 0000000..f3c44bd
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_declare_without_type.phpt
	@@ -0,0 +1,25 @@
	+--TEST--
	+AMQPExchange::declareExchange() without type set
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+
	+$ch = new AMQPChannel($cnn);
	+
	+$exchangge_name = "exchange-" . microtime(true);
	+
	+$ex = new AMQPExchange($ch);
	+$ex->setName($exchangge_name);
	+
	+try {
	+ $ex->declareExchange();
	+ echo 'Exchange declared', PHP_EOL;
	+} catch (AMQPException $e) {
	+ echo get_class($e), ': ', $e->getMessage(), PHP_EOL;
	+}
	+?>
	+--EXPECTF--
	+AMQPExchangeException: Could not declare exchange. Exchanges must have a type.
	diff --git a/amqp-1.6.1/tests/amqpexchange_get_channel.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_get_channel.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_get_channel.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_get_channel.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_get_connection.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_get_connection.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_get_connection.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_get_connection.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_invalid_type.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_invalid_type.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_invalid_type.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_invalid_type.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_basic.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_publish_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_empty_routing_key.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_empty_routing_key.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_publish_empty_routing_key.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_empty_routing_key.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_publish_timeout.disabled b/amqp-1.7.0alpha1/tests/amqpexchange_publish_timeout.disabled
	new file mode 100644
	index 0000000..95529c3
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_publish_timeout.disabled
	@@ -0,0 +1,57 @@
	+--TEST--
	+AMQPExchange
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp")) print "skip";
	+if (getenv("SKIP_SLOW_TESTS")) print "skip slow test" ;
	+?>
	+--FILE--
	+<?php
	+
	+$timeout = .68;
	+$conn = new AMQPConnection(array('write_timeout' => $timeout));
	+$conn->connect();
	+
	+$chan = new AMQPChannel($conn);
	+
	+$ex = new AMQPExchange($chan);
	+$ex->setName("exchange-pub-timeout-" . time());
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+$ex->declare();
	+
	+$queue = new AMQPQueue($chan);
	+$queue->setName('queue-for-'.$ex->getName());
	+$queue->setFlags(AMQP_EXCLUSIVE);
	+$queue->declare();
	+$queue->bind($ex->getName(), 'ignored-for-fanout');
	+
	+$message = str_repeat('d41d8cd98f00b204e9800998ecf8427e', 32); // 32768 - 1mb, 32 - 1Kb
	+$start = $end = 0;
	+
	+// try to exceed resources limit
	+try {
	+ while(true) {
	+ $start = microtime(true);
	+ $ex->publish($message, 'ignored-for-fanout', AMQP_NOPARAM, array('expiration' => 5000));
	+ }
	+} catch (Exception $e) {}
	+
	+try {
	+ while(true) {
	+ $start = microtime(true);
	+ // at this point publishing should be banned immediately
	+ $ex->publish($message, 'ignored-for-fanout', AMQP_NOPARAM, array('expiration' => 5000));
	+ }
	+} catch (Exception $e) {
	+ $end = microtime(true);
	+ echo get_class($e);
	+ echo PHP_EOL;
	+ echo $e->getMessage();
	+ echo PHP_EOL;
	+}
	+//$delay = abs($end - $start - $timeout);
	+//echo $delay < 0.005 ? 'true' : 'false';
	+?>
	+--EXPECT--
	+AMQPExchangeException
	+Socket error: Resource temporarily unavailable
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_null.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_null.phpt
	new file mode 100644
	index 0000000..7032ddd
	Binary files /dev/null and b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_null.phpt differ
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_with_properties.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties.phpt
	similarity index 95%
	rename from amqp-1.6.1/tests/amqpexchange_publish_with_properties.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties.phpt
	index 68ba630..9b4025e 100644
	--- a/amqp-1.6.1/tests/amqpexchange_publish_with_properties.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties.phpt
	@@ -1,111 +1,112 @@
	--TEST--
	AMQPExchange publish with properties
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	-require '_test_helpers.php';
	+require '_test_helpers.php.inc';

	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	$ex = new AMQPExchange($ch);
	$ex->setName("exchange-" . microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();

	$q = new AMQPQueue($ch);
	$q->declareQueue();

	$q->bind($ex->getName());

	$attrs = array(
	'content_type' => 1, // should be string
	'content_encoding' => 2, // should be string
	'message_id' => 3, // should be string
	//'user_id' => 4, // should be string // NOTE: fail due to Validated User-ID https://www.rabbitmq.com/validated-user-id.html, @see tests/amqpexchange_publish_with_properties_user_id_failure.phpt test
	'app_id' => 5, // should be string
	'delivery_mode' => '1-non-persistent', // should be long
	'priority' => '2high', // should be long
	'timestamp' => '123now', // should be long
	'expiration' => 100000000, // should be string // NOTE: in fact it is milliseconds for how long to stay in queue, see https://www.rabbitmq.com/ttl.html#per-message-ttl for details
	'type' => 7, // should be string
	'reply_to' => 8, // should be string
	'correlation_id' => 9, // should be string
	//'headers' => 'not array', // should be array // NOTE: covered in tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
	);

	$attrs_control = array(
	'content_type' => 1, // should be string
	'content_encoding' => 2, // should be string
	'message_id' => 3, // should be string
	//'user_id' => 4, // should be string // NOTE: fail due to Validated User-ID https://www.rabbitmq.com/validated-user-id.html, @see tests/amqpexchange_publish_with_properties_user_id_failure.phpt test
	'app_id' => 5, // should be string
	'delivery_mode' => '1-non-persistent', // should be long
	'priority' => '2high', // should be long
	'timestamp' => '123now', // should be long
	'expiration' => 100000000, // should be string // NOTE: in fact it is milliseconds for how long to stay in queue, see https://www.rabbitmq.com/ttl.html#per-message-ttl for details
	'type' => 7, // should be string
	'reply_to' => 8, // should be string
	'correlation_id' => 9, // should be string
	//'headers' => 'not array', // should be array // NOTE: covered in tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
	);

	echo $ex->publish('message', 'routing.key', AMQP_NOPARAM, $attrs) ? 'true' : 'false', PHP_EOL;


	-echo 'Message attributes are ', $attrs == $attrs_control ? 'the same' : 'not the same', PHP_EOL;
	+//var_dump($attrs, $attrs_control);
	+echo 'Message attributes are ', $attrs === $attrs_control ? 'the same' : 'not the same', PHP_EOL;

	$msg = $q->get(AMQP_AUTOACK);


	dump_message($msg);

	$ex->delete();
	$q->delete();


	?>
	--EXPECTF--
	true
	Message attributes are the same
	AMQPEnvelope
	getBody:
	string(7) "message"
	getContentType:
	string(1) "1"
	getRoutingKey:
	string(11) "routing.key"
	getDeliveryTag:
	int(1)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(1) "2"
	getType:
	string(1) "7"
	getTimeStamp:
	int(123)
	getPriority:
	int(2)
	getExpiration:
	string(9) "100000000"
	getUserId:
	string(0) ""
	getAppId:
	string(1) "5"
	getMessageId:
	string(1) "3"
	getReplyTo:
	string(1) "8"
	getCorrelationId:
	string(1) "9"
	getHeaders:
	array(0) {
	}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_with_properties_nested_header.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_nested_header.phpt
	similarity index 71%
	rename from amqp-1.6.1/tests/amqpexchange_publish_with_properties_nested_header.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_nested_header.phpt
	index 636e4c0..ccdc7a8 100644
	--- a/amqp-1.6.1/tests/amqpexchange_publish_with_properties_nested_header.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_nested_header.phpt
	@@ -1,103 +1,142 @@
	--TEST--
	AMQPExchange publish with properties - nested header values
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) {
	print "skip";
	} ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	$ex = new AMQPExchange($ch);
	$ex->setName("exchange-" . microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();

	$q = new AMQPQueue($ch);
	$q->setName('queue-' . microtime(true));
	$q->declareQueue();
	$q->bind($ex->getName());

	$headers = array(
	'nested' => array(
	'string' => 'passed',
	999 => 'numeric works',
	'sub-nested' => array(
	'should' => 'works',
	42 => 'too'
	),
	),
	);

	$ex->publish('message', 'routing.key', AMQP_NOPARAM, array('headers' => $headers));

	$message =$q->get(AMQP_AUTOACK);
	var_dump($message->getHeaders());
	-echo $message->getHeaders() == $headers ? 'same' : 'differs';
	+var_dump($headers);
	+echo $message->getHeaders() === $headers ? 'same' : 'differs';
	echo PHP_EOL, PHP_EOL;


	$headers = array(
	'x-death' => array(
	array (
	'reason' => 'rejected',
	'queue' => 'my_queue',
	'time' => 1410527691,
	'exchange' => 'my_exchange',
	'routing-keys' => array ('my_routing_key')
	)
	)
	);

	$ex->publish('message', 'routing.key', AMQP_NOPARAM, array('headers' => $headers));

	$message =$q->get(AMQP_AUTOACK);
	var_dump($message->getHeaders());
	-echo $message->getHeaders() == $headers ? 'same' : 'differs';
	+var_dump($headers);
	+echo $message->getHeaders() === $headers ? 'same' : 'differs';
	echo PHP_EOL, PHP_EOL;

	?>
	--EXPECT--
	array(1) {
	["nested"]=>
	array(3) {
	["string"]=>
	string(6) "passed"
	[999]=>
	string(13) "numeric works"
	["sub-nested"]=>
	array(2) {
	["should"]=>
	string(5) "works"
	[42]=>
	string(3) "too"
	}
	}
	}
	+array(1) {
	+ ["nested"]=>
	+ array(3) {
	+ ["string"]=>
	+ string(6) "passed"
	+ [999]=>
	+ string(13) "numeric works"
	+ ["sub-nested"]=>
	+ array(2) {
	+ ["should"]=>
	+ string(5) "works"
	+ [42]=>
	+ string(3) "too"
	+ }
	+ }
	+}
	same

	array(1) {
	["x-death"]=>
	array(1) {
	[0]=>
	array(5) {
	["reason"]=>
	string(8) "rejected"
	["queue"]=>
	string(8) "my_queue"
	["time"]=>
	int(1410527691)
	["exchange"]=>
	string(11) "my_exchange"
	["routing-keys"]=>
	array(1) {
	[0]=>
	string(14) "my_routing_key"
	}
	}
	}
	}
	-same
	+array(1) {
	+ ["x-death"]=>
	+ array(1) {
	+ [0]=>
	+ array(5) {
	+ ["reason"]=>
	+ string(8) "rejected"
	+ ["queue"]=>
	+ string(8) "my_queue"
	+ ["time"]=>
	+ int(1410527691)
	+ ["exchange"]=>
	+ string(11) "my_exchange"
	+ ["routing-keys"]=>
	+ array(1) {
	+ [0]=>
	+ string(14) "my_routing_key"
	+ }
	+ }
	+ }
	+}
	+same
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpexchange_publish_with_properties_user_id_failure.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_setArgument.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_setArgument.phpt
	new file mode 100644
	index 0000000..8bf83fc
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_setArgument.phpt
	@@ -0,0 +1,284 @@
	+--TEST--
	+AMQPExchange::setArgument() test
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$credentials = array();
	+
	+$cnn = new AMQPConnection($credentials);
	+$cnn->connect();
	+
	+$ch = new AMQPChannel($cnn);
	+
	+$heartbeat = 10;
	+$e_name_ae = 'test.exchange.ae.' . microtime(true);
	+$e_name = 'test.exchange.' . microtime(true);
	+
	+$ex_ae = new AMQPExchange($ch);
	+$ex_ae->setName($e_name_ae);
	+$ex_ae->setFlags(AMQP_AUTODELETE);
	+$ex_ae->setType(AMQP_EX_TYPE_FANOUT);
	+$ex_ae->declareExchange();
	+
	+var_dump($ex_ae);
	+
	+
	+$ex = new AMQPExchange($ch);
	+$ex->setName($e_name);
	+$ex->setFlags(AMQP_AUTODELETE);
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+// some real keys
	+$ex->setArgument("x-ha-policy", "all");
	+$ex->setArgument("alternate-exchange", $e_name_ae);
	+// some custom keys to test various cases
	+$ex->setArgument('x-empty-string', '');
	+$ex->setArgument('x-alternate-exchange-one-more-time', $e_name_ae);
	+$ex->setArgument('x-numeric-argument', $heartbeat * 10 * 1000);
	+$ex->declareExchange();
	+
	+var_dump($ex);
	+$ex->setArgument('x-alternate-exchange-one-more-time', null); // remov key
	+var_dump($ex);
	+?>
	+--EXPECTF--
	+object(AMQPExchange)#3 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "test.exchange.ae.%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(false)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(true)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(false)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(0) {
	+ }
	+}
	+object(AMQPExchange)#4 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "test.exchange.%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(false)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(true)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(false)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(5) {
	+ ["x-ha-policy"]=>
	+ string(3) "all"
	+ ["alternate-exchange"]=>
	+ string(%d) "test.exchange.ae.%f"
	+ ["x-empty-string"]=>
	+ string(0) ""
	+ ["x-alternate-exchange-one-more-time"]=>
	+ string(%d) "test.exchange.ae.%f"
	+ ["x-numeric-argument"]=>
	+ %s(100000)
	+ }
	+}
	+object(AMQPExchange)#4 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "test.exchange.%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(false)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(true)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(false)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(4) {
	+ ["x-ha-policy"]=>
	+ string(3) "all"
	+ ["alternate-exchange"]=>
	+ string(%d) "test.exchange.ae.%f"
	+ ["x-empty-string"]=>
	+ string(0) ""
	+ ["x-numeric-argument"]=>
	+ %s(100000)
	+ }
	+}
	diff --git a/amqp-1.6.1/tests/amqpexchange_set_flag.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_set_flag.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_set_flag.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_set_flag.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_set_flags.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_set_flags.phpt
	new file mode 100644
	index 0000000..8d76e87
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_set_flags.phpt
	@@ -0,0 +1,98 @@
	+--TEST--
	+AMQPExchange setFlags()
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+// Declare a new exchange
	+$ex = new AMQPExchange($ch);
	+$ex->setName('exchange-' . microtime(true));
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+$ex->setArguments(array("x-ha-policy" => "all"));
	+$ex->setFlags(AMQP_PASSIVE \| AMQP_DURABLE \| AMQP_AUTODELETE \| AMQP_INTERNAL);
	+
	+var_dump($ex);
	+?>
	+--EXPECTF--
	+object(AMQPExchange)#3 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "exchange-%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(true)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(true)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(true)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(true)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(1) {
	+ ["x-ha-policy"]=>
	+ string(3) "all"
	+ }
	+}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpexchange_unbind.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_unbind.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_unbind.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_unbind.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_unbind_with_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_unbind_with_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_unbind_with_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_unbind_with_arguments.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_unbind_without_key.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_unbind_without_key.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_unbind_without_key.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_unbind_without_key.phpt
	diff --git a/amqp-1.6.1/tests/amqpexchange_unbind_without_key_with_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_unbind_without_key_with_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpexchange_unbind_without_key_with_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpexchange_unbind_without_key_with_arguments.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpexchange_var_dump.phpt b/amqp-1.7.0alpha1/tests/amqpexchange_var_dump.phpt
	new file mode 100644
	index 0000000..98a05b2
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpexchange_var_dump.phpt
	@@ -0,0 +1,171 @@
	+--TEST--
	+AMQPExchange var_dump
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+// Declare a new exchange
	+$ex = new AMQPExchange($ch);
	+$ex->setName('exchange-' . microtime(true));
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+var_dump($ex);
	+$ex->setArguments(array("x-ha-policy" => "all"));
	+var_dump($ex);
	+?>
	+--EXPECTF--
	+object(AMQPExchange)#3 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "exchange-%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(false)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(false)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(false)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(0) {
	+ }
	+}
	+object(AMQPExchange)#3 (9) {
	+ ["connection":"AMQPExchange":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["channel":"AMQPExchange":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+ }
	+ ["name":"AMQPExchange":private]=>
	+ string(%d) "exchange-%f"
	+ ["type":"AMQPExchange":private]=>
	+ string(6) "fanout"
	+ ["passive":"AMQPExchange":private]=>
	+ bool(false)
	+ ["durable":"AMQPExchange":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPExchange":private]=>
	+ bool(false)
	+ ["internal":"AMQPExchange":private]=>
	+ bool(false)
	+ ["arguments":"AMQPExchange":private]=>
	+ array(1) {
	+ ["x-ha-policy"]=>
	+ string(3) "all"
	+ }
	+}
	\ No newline at end of file
	diff --git a/amqp-1.7.0alpha1/tests/amqpqueue_attributes.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_attributes.phpt
	new file mode 100644
	index 0000000..dd63e00
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_attributes.phpt
	@@ -0,0 +1,24 @@
	+--TEST--
	+AMQPQueue attributes
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+
	+$q = new AMQPQueue($ch);
	+
	+$q->setArguments(array('existent' => 'value', 'false' => false));
	+
	+foreach (array('existent', 'false', 'nonexistent') as $key) {
	+ echo "$key: ", var_export($q->hasArgument($key), true), ', ', var_export($q->getArgument($key)), PHP_EOL;
	+}
	+
	+?>
	+--EXPECT--
	+existent: true, 'value'
	+false: true, false
	+nonexistent: false, false
	diff --git a/amqp-1.6.1/tests/amqpqueue_bind_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_bind_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_bind_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_bind_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_bind_basic_empty_routing_key.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_bind_basic_empty_routing_key.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_bind_basic_empty_routing_key.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_bind_basic_empty_routing_key.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_bind_basic_headers_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_bind_basic_headers_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_bind_basic_headers_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_bind_basic_headers_arguments.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_cancel.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_cancel.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_cancel.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_cancel.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_construct_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_construct_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_construct_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_construct_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_consume_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_consume_basic.phpt
	similarity index 98%
	rename from amqp-1.6.1/tests/amqpqueue_consume_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_consume_basic.phpt
	index d3e43bf..046db51 100644
	--- a/amqp-1.6.1/tests/amqpqueue_consume_basic.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_consume_basic.phpt
	@@ -1,139 +1,139 @@
	--TEST--
	AMQPQueue::consume basic
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	-require '_test_helpers.php';
	+require '_test_helpers.php.inc';

	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	// Declare a new exchange
	$ex = new AMQPExchange($ch);
	$ex->setName('exchange-' . microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();

	// Create a new queue
	$q = new AMQPQueue($ch);
	$q->setName('queue-' . microtime(true));
	$q->declareQueue();

	// Bind it on the exchange to routing.key
	$q->bind($ex->getName(), 'routing.*');

	// Publish a message to the exchange with a routing key
	$ex->publish('message1', 'routing.1', AMQP_NOPARAM, array('content_type' => 'plain/test', 'headers' => array('foo' => 'bar')));
	$ex->publish('message2', 'routing.2', AMQP_NOPARAM, array('delivery_mode' => AMQP_DURABLE));
	$ex->publish('message3', 'routing.3', AMQP_DURABLE); // this is wrong way to make messages persistent

	$count = 0;

	function consumeThingsTwoTimes($message, $queue) {
	global $count;

	echo "call #$count", PHP_EOL;
	// Read from the queue
	dump_message($message);
	echo PHP_EOL;
	$count++;

	if ($count >= 2) {
	return false;
	}

	return true;
	}

	// Read from the queue
	$q->consume("consumeThingsTwoTimes", AMQP_AUTOACK);

	$q->delete();
	$ex->delete();

	?>
	--EXPECTF--
	call #0
	AMQPEnvelope
	getBody:
	string(8) "message1"
	getContentType:
	string(10) "plain/test"
	getRoutingKey:
	string(9) "routing.1"
	getDeliveryTag:
	int(1)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	array(1) {
	["foo"]=>
	string(3) "bar"
	}

	call #1
	AMQPEnvelope
	getBody:
	string(8) "message2"
	getContentType:
	string(10) "text/plain"
	getRoutingKey:
	string(9) "routing.2"
	getDeliveryTag:
	int(2)
	getDeliveryMode:
	int(2)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	array(0) {
	}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpqueue_consume_multiple.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_consume_multiple.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_consume_multiple.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_consume_multiple.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpqueue_consume_multiple_no_doubles.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_consume_multiple_no_doubles.phpt
	new file mode 100644
	index 0000000..59790ab
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_consume_multiple_no_doubles.phpt
	@@ -0,0 +1,33 @@
	+--TEST--
	+AMQPQueue::consume multiple (no doubles)
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$time = microtime(true);
	+
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+
	+$ch = new AMQPChannel($cnn);
	+
	+// Create a new queue
	+$q = new AMQPQueue($ch);
	+$q->setName('queue-' . microtime(true));
	+$q->declareQueue();
	+
	+var_dump($q->getConsumerTag());
	+$q->consume();
	+var_dump($tag1=$q->getConsumerTag());
	+$q->consume(null, AMQP_JUST_CONSUME);
	+var_dump($tag2=$q->getConsumerTag());
	+
	+echo ($tag1 == $tag2 ? 'equals' : 'differs'), PHP_EOL;
	+
	+
	+?>
	+--EXPECTF--
	+NULL
	+string(%d) "amq.ctag-%s"
	+string(%d) "amq.ctag-%s"
	+equals
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpqueue_consume_nonexistent.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_consume_nonexistent.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_consume_nonexistent.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_consume_nonexistent.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_consume_timeout.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_consume_timeout.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_consume_timeout.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_consume_timeout.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_declare_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_declare_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_declare_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_declare_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_declare_with_arguments.phpt
	similarity index 58%
	copy from amqp-1.6.1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
	copy to amqp-1.7.0alpha1/tests/amqpqueue_declare_with_arguments.phpt
	index d786153..f92ae50 100644
	--- a/amqp-1.6.1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_declare_with_arguments.phpt
	@@ -1,28 +1,29 @@
	--TEST--
	-AMQPQueue
	+AMQPQueue::declareQueue() - with arguments
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->connect();
	-
	$ch = new AMQPChannel($cnn);

	$ex = new AMQPExchange($ch);
	$ex->setName('exchange-' . microtime(true));
	$ex->setType(AMQP_EX_TYPE_DIRECT);
	$ex->declareExchange();

	$queue = new AMQPQueue($ch);
	$queue->setName("queue-" . microtime(true));
	-$queue->declareQueue();
	-var_dump($queue->bind($ex->getName()));
	-var_dump($queue->unbind($ex->getName()));
	+$queue->setArgument('x-dead-letter-exchange', '');
	+$queue->setArgument('x-dead-letter-routing-key', 'some key');
	+$queue->setArgument('x-message-ttl', 42);
	+$queue->setFlags(AMQP_AUTODELETE);
	+$res = $queue->declareQueue();
	+
	+var_dump($res);

	$queue->delete();
	-$ex->delete();
	?>
	--EXPECT--
	-bool(true)
	-bool(true)
	+int(0)
	diff --git a/amqp-1.6.1/tests/amqpqueue_delete_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_delete_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_delete_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_delete_basic.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_empty_name.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_empty_name.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_empty_name.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_empty_name.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_basic.phpt
	similarity index 98%
	rename from amqp-1.6.1/tests/amqpqueue_get_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_basic.phpt
	index 1ee692a..3a2f48e 100644
	--- a/amqp-1.6.1/tests/amqpqueue_get_basic.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_get_basic.phpt
	@@ -1,165 +1,165 @@
	--TEST--
	AMQPQueue::get basic
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	-require '_test_helpers.php';
	+require '_test_helpers.php.inc';

	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	// Declare a new exchange
	$ex = new AMQPExchange($ch);
	$ex->setName('exchange-'. microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();

	// Create a new queue
	$q = new AMQPQueue($ch);
	$q->setName('queue-' . microtime(true));
	$q->declareQueue();

	// Bind it on the exchange to routing.key
	$q->bind($ex->getName(), 'routing.*');
	// Publish a message to the exchange with a routing key
	$ex->publish('message1', 'routing.1', AMQP_NOPARAM, array('content_type' => 'plain/test', 'headers' => array('foo' => 'bar')));
	$ex->publish('message2', 'routing.2', AMQP_DURABLE);
	$ex->publish('message3', 'routing.3');

	for ($i = 0; $i < 4; $i++) {
	echo "call #$i", PHP_EOL;
	// Read from the queue
	$msg = $q->get(AMQP_AUTOACK);
	dump_message($msg);
	echo PHP_EOL;
	}

	?>
	--EXPECTF--
	call #0
	AMQPEnvelope
	getBody:
	string(8) "message1"
	getContentType:
	string(10) "plain/test"
	getRoutingKey:
	string(9) "routing.1"
	getDeliveryTag:
	int(1)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	array(1) {
	["foo"]=>
	string(3) "bar"
	}

	call #1
	AMQPEnvelope
	getBody:
	string(8) "message2"
	getContentType:
	string(10) "text/plain"
	getRoutingKey:
	string(9) "routing.2"
	getDeliveryTag:
	int(2)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	array(0) {
	}

	call #2
	AMQPEnvelope
	getBody:
	string(8) "message3"
	getContentType:
	string(10) "text/plain"
	getRoutingKey:
	string(9) "routing.3"
	getDeliveryTag:
	int(3)
	getDeliveryMode:
	int(1)
	getExchangeName:
	string(%d) "exchange-%f"
	isRedelivery:
	bool(false)
	getContentEncoding:
	string(0) ""
	getType:
	string(0) ""
	getTimeStamp:
	int(0)
	getPriority:
	int(0)
	getExpiration:
	string(0) ""
	getUserId:
	string(0) ""
	getAppId:
	string(0) ""
	getMessageId:
	string(0) ""
	getReplyTo:
	string(0) ""
	getCorrelationId:
	string(0) ""
	getHeaders:
	array(0) {
	}

	call #3
	bool(false)
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_channel.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_channel.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_get_channel.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_channel.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_connection.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_connection.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_get_connection.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_connection.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_empty_body.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_empty_body.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_get_empty_body.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_empty_body.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_headers.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_headers.phpt
	similarity index 78%
	rename from amqp-1.6.1/tests/amqpqueue_get_headers.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_headers.phpt
	index 5ea6727..a0fe6e0 100644
	--- a/amqp-1.6.1/tests/amqpqueue_get_headers.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_get_headers.phpt
	@@ -1,56 +1,62 @@
	--TEST--
	AMQPQueue::get headers
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	// Declare a new exchange
	$ex = new AMQPExchange($ch);
	$ex->setName('exchange' . microtime(true));
	$ex->setType(AMQP_EX_TYPE_FANOUT);
	$ex->declareExchange();

	// Create a new queue
	$q = new AMQPQueue($ch);
	$q->setName('queue1' . microtime(true));
	$q->declareQueue();

	// Bind it on the exchange to routing.key
	$q->bind($ex->getName(), 'routing.*');

	// Publish a message to the exchange with a routing key
	$ex->publish('body', 'routing.1', AMQP_NOPARAM, array("headers" => array(
	"first" => "one",
	"second" => 2
	)));

	// Read from the queue
	$msg = $q->get(AMQP_AUTOACK);

	echo $msg->getBody() . "\n";
	var_dump($msg->getHeaders());
	echo $msg->getContentType() . "\n";
	+
	+var_dump($msg->hasHeader("first"));
	echo $msg->getHeader("first") . "\n";
	echo $msg->getHeader("second") . "\n";

	+echo 'Has nonexistent header: ', var_export($msg->hasHeader("nonexistent"), true), PHP_EOL;
	+echo 'Get nonexistent header: ', var_export($msg->getHeader("nonexistent"), true), PHP_EOL;
	+
	$ex->delete();
	$q->delete();
	?>
	--EXPECT--
	body
	array(2) {
	["first"]=>
	string(3) "one"
	["second"]=>
	int(2)
	}
	text/plain
	+bool(true)
	one
	2
	-
	-
	+Has nonexistent header: false
	+Get nonexistent header: false
	diff --git a/amqp-1.6.1/tests/amqpqueue_get_nonexistent.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_get_nonexistent.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_get_nonexistent.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_get_nonexistent.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_nack.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_nack.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_nack.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_nack.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_nested_arrays.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_nested_arrays.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_nested_arrays.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_nested_arrays.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_nested_headers.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_nested_headers.phpt
	similarity index 94%
	rename from amqp-1.6.1/tests/amqpqueue_nested_headers.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_nested_headers.phpt
	index 32c9d3e..9b4bac5 100644
	--- a/amqp-1.6.1/tests/amqpqueue_nested_headers.phpt
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_nested_headers.phpt
	@@ -1,86 +1,86 @@
	--TEST--
	AMQPQueue::get headers
	--SKIPIF--
	<?php if (!extension_loaded("amqp")) print "skip"; ?>
	--FILE--
	<?php
	$cnn = new AMQPConnection();
	$cnn->connect();

	$ch = new AMQPChannel($cnn);

	// create an error exchange and bind a queue to it:
	$errorXchange = new AMQPExchange($ch);
	$errorXchange->setName('errorXchange' . microtime(true));
	$errorXchange->setType(AMQP_EX_TYPE_TOPIC);
	$errorXchange->declareExchange();

	$errorQ = new AMQPQueue($ch);
	$errorQ->setName('errorQueue' . microtime(true));
	$errorQ->declareQueue();
	$errorQ->bind($errorXchange->getName(), '#');


	// Declare a new exchange and queue using this dead-letter-exchange:
	$ex = new AMQPExchange($ch);
	$ex->setName('exchange-' . microtime(true));
	$ex->setType(AMQP_EX_TYPE_TOPIC);
	$ex->declareExchange();
	$q = new AMQPQueue($ch);
	$q->setName('queue-' . microtime(true));
	$q->setArgument('x-dead-letter-exchange', $errorXchange->getName());
	$q->declareQueue();
	$q->bind($ex->getName(), '#');


	// publish a message:
	$ex->publish(
	'body', 'routing.1', AMQP_NOPARAM, array(
	'headers' => array(
	'foo' => 'bar',
	'baz' => array('a', 'bc', 'def')
	)
	)
	);

	// Read from the queue and reject, so it gets dead-lettered:
	$msg = $q->get(AMQP_NOPARAM);
	$q->nack($msg->getDeliveryTag());

	sleep(1);
	// Now read from the error queue:
	$msg = $errorQ->get(AMQP_AUTOACK);

	$header = $msg->getHeader('x-death');

	-echo isset($header['count']) ? 'with' : 'without', ' count ', PHP_EOL;
	+echo isset($header[0]['count']) ? 'with' : 'without', ' count ', PHP_EOL;

	-unset($header['count']);
	+unset($header[0]['count']);

	var_dump($header);

	$ex->delete();
	$q->delete();
	$errorXchange->delete();
	$errorQ->delete();
	?>
	--EXPECTF--
	%s
	array(1) {
	[0]=>
	array(5) {
	["reason"]=>
	string(8) "rejected"
	["queue"]=>
	string(%d) "queue-%f"
	["time"]=>
	float(%d)
	["exchange"]=>
	string(%d) "exchange-%f"
	["routing-keys"]=>
	array(1) {
	[0]=>
	string(9) "routing.1"
	}
	}
	}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/amqpqueue_purge_basic.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_purge_basic.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_purge_basic.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_purge_basic.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpqueue_setArgument.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_setArgument.phpt
	new file mode 100644
	index 0000000..4792bdb
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_setArgument.phpt
	@@ -0,0 +1,270 @@
	+--TEST--
	+AMQPQueue::setArgument() test
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$credentials = array();
	+
	+$cnn = new AMQPConnection($credentials);
	+$cnn->connect();
	+
	+$ch = new AMQPChannel($cnn);
	+
	+$heartbeat = 10;
	+$q_dead_name = 'test.queue.dead.' . microtime(true);
	+$q_name = 'test.queue.' . microtime(true);
	+
	+$q = new AMQPQueue($ch);
	+$q->setName($q_name);
	+$q->setFlags(AMQP_AUTODELETE);
	+$q->declareQueue();
	+
	+var_dump($q);
	+
	+
	+$q_dead = new AMQPQueue($ch);
	+$q_dead->setName($q_dead_name);
	+$q_dead->setArgument('x-dead-letter-exchange', '');
	+$q_dead->setArgument('x-dead-letter-routing-key', $q_name);
	+$q_dead->setArgument('x-message-ttl', $heartbeat * 10 * 1000);
	+$q_dead->setFlags(AMQP_AUTODELETE);
	+$q_dead->declareQueue();
	+
	+var_dump($q_dead);
	+$q_dead->setArgument('x-dead-letter-routing-key', null); // removes this key
	+var_dump($q_dead);
	+?>
	+--EXPECTF--
	+object(AMQPQueue)#3 (9) {
	+ ["connection":"AMQPQueue":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPQueue":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPQueue":private]=>
	+ string(%d) "test.queue.%f"
	+ ["consumer_tag":"AMQPQueue":private]=>
	+ NULL
	+ ["passive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["durable":"AMQPQueue":private]=>
	+ bool(false)
	+ ["exclusive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPQueue":private]=>
	+ bool(true)
	+ ["arguments":"AMQPQueue":private]=>
	+ array(0) {
	+ }
	+}
	+object(AMQPQueue)#4 (9) {
	+ ["connection":"AMQPQueue":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPQueue":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPQueue":private]=>
	+ string(%d) "test.queue.dead.%f"
	+ ["consumer_tag":"AMQPQueue":private]=>
	+ NULL
	+ ["passive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["durable":"AMQPQueue":private]=>
	+ bool(false)
	+ ["exclusive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPQueue":private]=>
	+ bool(true)
	+ ["arguments":"AMQPQueue":private]=>
	+ array(3) {
	+ ["x-dead-letter-exchange"]=>
	+ string(0) ""
	+ ["x-dead-letter-routing-key"]=>
	+ string(%d) "test.queue.%f"
	+ ["x-message-ttl"]=>
	+ %s(100000)
	+ }
	+}
	+object(AMQPQueue)#4 (9) {
	+ ["connection":"AMQPQueue":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["channel":"AMQPQueue":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ %s(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ %s(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ %s(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ %s(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ %s(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ %s(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ %s(0)
	+ }
	+ ["name":"AMQPQueue":private]=>
	+ string(%d) "test.queue.dead.%f"
	+ ["consumer_tag":"AMQPQueue":private]=>
	+ NULL
	+ ["passive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["durable":"AMQPQueue":private]=>
	+ bool(false)
	+ ["exclusive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPQueue":private]=>
	+ bool(true)
	+ ["arguments":"AMQPQueue":private]=>
	+ array(2) {
	+ ["x-dead-letter-exchange"]=>
	+ string(0) ""
	+ ["x-message-ttl"]=>
	+ %s(100000)
	+ }
	+}
	diff --git a/amqp-1.6.1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
	diff --git a/amqp-1.6.1/tests/amqpqueue_unbind_basic_headers_arguments.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_unbind_basic_headers_arguments.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/amqpqueue_unbind_basic_headers_arguments.phpt
	rename to amqp-1.7.0alpha1/tests/amqpqueue_unbind_basic_headers_arguments.phpt
	diff --git a/amqp-1.7.0alpha1/tests/amqpqueue_var_dump.phpt b/amqp-1.7.0alpha1/tests/amqpqueue_var_dump.phpt
	new file mode 100644
	index 0000000..20b5234
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/amqpqueue_var_dump.phpt
	@@ -0,0 +1,98 @@
	+--TEST--
	+AMQPQueue var_dump
	+--SKIPIF--
	+<?php
	+if (!extension_loaded("amqp") \|\| version_compare(PHP_VERSION, '5.3', '<')) {
	+ print "skip";
	+}
	+--FILE--
	+<?php
	+$cnn = new AMQPConnection();
	+$cnn->connect();
	+$ch = new AMQPChannel($cnn);
	+// Declare a new exchange
	+$ex = new AMQPExchange($ch);
	+$ex->setName('exchange1');
	+$ex->setType(AMQP_EX_TYPE_FANOUT);
	+$ex->declareExchange();
	+// Create a new queue
	+$q = new AMQPQueue($ch);
	+$q->setName('queue_var_dump');
	+$q->declareQueue();
	+var_dump($q);
	+?>
	+--EXPECT--
	+object(AMQPQueue)#4 (9) {
	+ ["connection":"AMQPQueue":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["channel":"AMQPQueue":private]=>
	+ object(AMQPChannel)#2 (3) {
	+ ["connection":"AMQPChannel":private]=>
	+ object(AMQPConnection)#1 (11) {
	+ ["login":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["password":"AMQPConnection":private]=>
	+ string(5) "guest"
	+ ["host":"AMQPConnection":private]=>
	+ string(9) "localhost"
	+ ["vhost":"AMQPConnection":private]=>
	+ string(1) "/"
	+ ["port":"AMQPConnection":private]=>
	+ int(5672)
	+ ["read_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["write_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["connect_timeout":"AMQPConnection":private]=>
	+ float(0)
	+ ["channel_max":"AMQPConnection":private]=>
	+ int(256)
	+ ["frame_max":"AMQPConnection":private]=>
	+ int(131072)
	+ ["heartbeat":"AMQPConnection":private]=>
	+ int(0)
	+ }
	+ ["prefetch_count":"AMQPChannel":private]=>
	+ int(3)
	+ ["prefetch_size":"AMQPChannel":private]=>
	+ int(0)
	+ }
	+ ["name":"AMQPQueue":private]=>
	+ string(14) "queue_var_dump"
	+ ["consumer_tag":"AMQPQueue":private]=>
	+ NULL
	+ ["passive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["durable":"AMQPQueue":private]=>
	+ bool(false)
	+ ["exclusive":"AMQPQueue":private]=>
	+ bool(false)
	+ ["auto_delete":"AMQPQueue":private]=>
	+ bool(true)
	+ ["arguments":"AMQPQueue":private]=>
	+ array(0) {
	+ }
	+}
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/bug_17831.phpt b/amqp-1.7.0alpha1/tests/bug_17831.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_17831.phpt
	rename to amqp-1.7.0alpha1/tests/bug_17831.phpt
	diff --git a/amqp-1.6.1/tests/bug_19707.phpt b/amqp-1.7.0alpha1/tests/bug_19707.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_19707.phpt
	rename to amqp-1.7.0alpha1/tests/bug_19707.phpt
	diff --git a/amqp-1.6.1/tests/bug_19840.phpt b/amqp-1.7.0alpha1/tests/bug_19840.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_19840.phpt
	rename to amqp-1.7.0alpha1/tests/bug_19840.phpt
	diff --git a/amqp-1.7.0alpha1/tests/bug_61533.phpt b/amqp-1.7.0alpha1/tests/bug_61533.phpt
	new file mode 100644
	index 0000000..ae3178e
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/bug_61533.phpt
	@@ -0,0 +1,24 @@
	+--TEST--
	+Constructing AMQPQueue with AMQPConnection segfaults
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) print "skip"; ?>
	+--FILE--
	+<?php
	+$conn = new AMQPConnection();
	+$conn->connect();
	+$chan = new AMQPChannel($conn);
	+
	+if (!class_exists('TypeError')) {
	+ class TypeError extends Exception {}
	+}
	+
	+try {
	+ error_reporting(error_reporting() & ~E_WARNING);
	+ $queue = new AMQPQueue($conn);
	+} catch (TypeError $e) {
	+ echo get_class($e), ': ', $e->getMessage(), '.', PHP_EOL; // we pad exception message with dot to make EXPETF be the same on PHP 5 and PHP 7
	+}
	+
	+?>
	+--EXPECTF--
	+%s: Argument 1 passed to AMQPQueue::__construct() must be an instance of AMQPChannel, instance of AMQPConnection given%s
	diff --git a/amqp-1.6.1/tests/bug_62354.phpt b/amqp-1.7.0alpha1/tests/bug_62354.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_62354.phpt
	rename to amqp-1.7.0alpha1/tests/bug_62354.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh147.phpt b/amqp-1.7.0alpha1/tests/bug_gh147.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh147.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh147.phpt
	diff --git a/amqp-1.7.0alpha1/tests/bug_gh155_direct_reply_to.phpt b/amqp-1.7.0alpha1/tests/bug_gh155_direct_reply_to.phpt
	new file mode 100644
	index 0000000..f3a901c
	--- /dev/null
	+++ b/amqp-1.7.0alpha1/tests/bug_gh155_direct_reply_to.phpt
	@@ -0,0 +1,76 @@
	+--TEST--
	+#155 RabbitMQ's Direct reply-to (related to consume multiple)
	+--SKIPIF--
	+<?php if (!extension_loaded("amqp")) {
	+ print "skip";
	+} ?>
	+--FILE--
	+<?php
	+$conn = new AMQPConnection();
	+$conn->connect();
	+
	+$channel = new AMQPChannel($conn);
	+$exchange = new AMQPExchange($channel);
	+
	+
	+$q_reply_to = new AMQPQueue($channel);
	+$q_reply_to->setName('amq.rabbitmq.reply-to');
	+$q_reply_to->consume(null, AMQP_AUTOACK);
	+
	+
	+// this will be kind out long-living queue to
	+$q_request = new AMQPQueue($channel);
	+$q_request->setName('reply-to-requests');
	+$q_request->setFlags(AMQP_DURABLE);
	+$q_request->declareQueue();
	+$q_request->purge();
	+
	+$q_request_name = $q_request->getName();
	+
	+echo 'Publishing request...' . PHP_EOL;
	+
	+$exchange->publish('request', $q_request_name, AMQP_NOPARAM, array('reply_to' => 'amq.rabbitmq.reply-to'));
	+
	+$request_message = $q_request->get(AMQP_AUTOACK);
	+
	+$reply_to = $request_message->getReplyTo();
	+
	+echo 'Reply-to queue: ', $reply_to, PHP_EOL;
	+
	+echo 'Prepare response queue...' . PHP_EOL;
	+
	+$channel_2 = new AMQPChannel($conn);
	+
	+$q_reply = new AMQPQueue($channel_2);
	+$q_reply->setName($reply_to);
	+$q_reply->setFlags(AMQP_PASSIVE);
	+$q_reply->declareQueue();
	+
	+echo 'Publishing response...' . PHP_EOL;
	+
	+$exchange->publish('response', $reply_to, AMQP_NOPARAM);
	+
	+
	+echo 'Waiting for reply...' . PHP_EOL;
	+$q_reply_to->consume(function (AMQPEnvelope $message, AMQPQueue $queue) {
	+ echo $message->getBody() . ': ' . $message->getRoutingKey() . PHP_EOL;
	+
	+ echo 'Received on ', $queue->getName(), ' queue', PHP_EOL;
	+
	+ return false;
	+}, AMQP_JUST_CONSUME);
	+
	+echo 'done', PHP_EOL;
	+
	+
	+
	+?>
	+--EXPECTF--
	+Publishing request...
	+Reply-to queue: amq.rabbitmq.reply-to.%s.%s==
	+Prepare response queue...
	+Publishing response...
	+Waiting for reply...
	+response: amq.rabbitmq.reply-to.%s.%s==
	+Received on amq.rabbitmq.reply-to queue
	+done
	\ No newline at end of file
	diff --git a/amqp-1.6.1/tests/bug_gh50-1.phpt b/amqp-1.7.0alpha1/tests/bug_gh50-1.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh50-1.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh50-1.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh50-2.phpt b/amqp-1.7.0alpha1/tests/bug_gh50-2.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh50-2.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh50-2.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh50-3.phpt b/amqp-1.7.0alpha1/tests/bug_gh50-3.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh50-3.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh50-3.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh50-4.phpt b/amqp-1.7.0alpha1/tests/bug_gh50-4.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh50-4.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh50-4.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh53-2.phpt b/amqp-1.7.0alpha1/tests/bug_gh53-2.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh53-2.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh53-2.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh53.phpt b/amqp-1.7.0alpha1/tests/bug_gh53.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh53.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh53.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh72-1.phpt b/amqp-1.7.0alpha1/tests/bug_gh72-1.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh72-1.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh72-1.phpt
	diff --git a/amqp-1.6.1/tests/bug_gh72-2.phpt b/amqp-1.7.0alpha1/tests/bug_gh72-2.phpt
	similarity index 100%
	rename from amqp-1.6.1/tests/bug_gh72-2.phpt
	rename to amqp-1.7.0alpha1/tests/bug_gh72-2.phpt
	diff --git a/amqp-1.6.1/tests/package-version.phpt b/amqp-1.7.0alpha1/tests/package-version.phpt
	similarity index 81%
	rename from amqp-1.6.1/tests/package-version.phpt
	rename to amqp-1.7.0alpha1/tests/package-version.phpt
	index c275d58..52ffe0e 100644
	--- a/amqp-1.6.1/tests/package-version.phpt
	+++ b/amqp-1.7.0alpha1/tests/package-version.phpt
	@@ -1,31 +1,25 @@
	--TEST--
	Compare version in package.xml and module
	--SKIPIF--
	<?php if (!function_exists('simplexml_load_file')) print "skip"; ?>
	--FILE--
	<?php
	$package = simplexml_load_file(dirname(__FILE__) . '/../package.xml');
	$packageVersion = $package->version->release;

	$ext = new ReflectionExtension('amqp');
	-ob_start();
	-$ext->info();
	-$info = ob_get_contents();
	-ob_end_clean();
	-$matches = array();
	-preg_match('/Version\s=>\s([0-9.a-z-]+)/m', $info, $matches);
	-$srcVersion = $matches[1];
	+$srcVersion = $ext->getVersion();

	if (0 === strcmp($packageVersion, $srcVersion)) {
	echo "package.xml matches phpinfo() output\n";
	} else {
	printf("src version: %s, package.xml: %s\n", $srcVersion, $packageVersion);
	}
	if (0 === strcmp($packageVersion, $ext->getVersion())) {
	echo "package.xml matches extension version\n";
	} else {
	printf("ext version: %s, package.xml: %s\n", $ext->getVersion(), $packageVersion);
	}
	--EXPECT--
	package.xml matches phpinfo() output
	package.xml matches extension version
	diff --git a/package.xml b/package.xml
	index 42d3de2..e11d9a7 100644
	--- a/package.xml
	+++ b/package.xml
	@@ -1,366 +1,726 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package packagerversion="1.10.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
	<name>amqp</name>
	<channel>pecl.php.net</channel>
	<summary>Communicate with any AMQP compliant server</summary>
	<description>This extension can communicate with any AMQP spec 0-9-1 compatible server, such as RabbitMQ, OpenAMQP and Qpid, giving you the ability to create and delete exchanges and queues, as well as publish to any exchange and consume from any queue.</description>
	<lead>
	<name>Lars Strojny</name>
	<user>lstrojny</user>
	<email>lstrojny@php.net</email>
	<active>yes</active>
	</lead>
	<lead>
	<name>Pieter de Zwart</name>
	<user>pdezwart</user>
	<email>pdezwart@php.net</email>
	<active>no</active>
	</lead>
	- <date>2015-11-23</date>
	- <time>18:00:39</time>
	+ <date>2015-11-11</date>
	+ <time>17:00:48</time>
	<version>
	- <release>1.6.1</release>
	+ <release>1.7.0alpha1</release>
	<api>1.0.0</api>
	</version>
	<stability>
	- <release>stable</release>
	+ <release>beta</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.php.net/license">PHP License</license>
	<notes>
	-1.6.1 Release:
	- * Fix invalid amqp_table_t arguments population and freeing
	- * Fix not properly deleted connection resource
	-
	- For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.6.0...v1.6.1
	-
	+* Add PHP7 support (Bogdan Padalko, Steffen Hanikel)
	+* Add AMQPEnvelope::hasHeader(), AMQPExchange::hasArgument() and AMQPQueue::hasArgument() to check whether specific header exists (Bogdan Padalko)
	+* Completely move to zend object custom objects (AMQPEnvelope, AMQPExchange and AMQPQueue) (Bogdan Padalko)
	+* Use zend object on custom objects for properties storing (AMQPConnection and AMQPChannel) (Bogdan Padalko)
	+* Fix not properly deleted connection resource. (Bogdan Padalko, Steffen Hanikel)
	+* Fix not properly allocated and freed amqp_table_t arguments table memory. (Bogdan Padalko, Steffen Hanikel)
	+
	+For a complete list of changes see:
	+https://github.com/pdezwart/php-amqp/compare/v1.6.0...v1.7.0alpha1
	+ </notes>
	+ <contents>
	+ <dir name="/">
	+ <file md5sum="38bb32c983edf6ace1bcd6b606b6a372" name="amqp.c" role="src" />
	+ <file md5sum="fa376fb7888f98655285428918fde559" name="amqp_channel.c" role="src" />
	+ <file md5sum="0d454a53c80dfcb29f8722dc1a2422c4" name="amqp_channel.h" role="src" />
	+ <file md5sum="df7e84490c55288f8117e1c273260ee2" name="amqp_connection.c" role="src" />
	+ <file md5sum="7891564f09f0e01c63050055e9b766a9" name="amqp_connection.h" role="src" />
	+ <file md5sum="0acfb254004728d537f25efc1bf85c21" name="amqp_connection_resource.c" role="src" />
	+ <file md5sum="a26ff5622b998fa2e9b0f489a3ba91d8" name="amqp_connection_resource.h" role="src" />
	+ <file md5sum="dc959063b8da036cdbac53cf95f2a2d3" name="amqp_envelope.c" role="src" />
	+ <file md5sum="b74f6e72cbe925d37a2850a690ec68fb" name="amqp_envelope.h" role="src" />
	+ <file md5sum="7f1bb8aef7a1875d9744152e7bf28b59" name="amqp_exchange.c" role="src" />
	+ <file md5sum="29bc658d47714e64fdac91330e0f30e5" name="amqp_exchange.h" role="src" />
	+ <file md5sum="1b0ad82284d7c89d3c12b0ed23e64dac" name="amqp_queue.c" role="src" />
	+ <file md5sum="98bd60d86a6313b68f59979c641af774" name="amqp_queue.h" role="src" />
	+ <file md5sum="29487565af6aa805537021a910422e5d" name="php5_support.h" role="src" />
	+ <file md5sum="b11187fd3ac05ac40860a6455e815232" name="php7_support.h" role="src" />
	+ <file md5sum="0c722b687530754af31015353c907d1a" name="php_amqp.h" role="src" />
	+ <file md5sum="d200246c81bad1e5ecff89ba0247ab28" name="config.m4" role="src" />
	+ <file md5sum="1518f35a7beb49a2d83575eaa1b84865" name="config.w32" role="src" />
	+ <file md5sum="fef7c9a5d92ed9043d5a8f39c9a99fa7" name="benchmark.php" role="doc" />
	+ <file md5sum="c2bc5a8aa3fb7f8d0c924f584e20809d" name="CREDITS" role="doc" />
	+ <file md5sum="b3e70313289e3ea66cae3089b7e571b8" name="LICENSE" role="doc" />
	+ <file md5sum="3d2f028b7fceb8cf35e56237338af93d" name="stubs/AMQP.php" role="doc" />
	+ <file md5sum="6709d02e03739e36715987b4b1d1cbe3" name="stubs/AMQPChannel.php" role="doc" />
	+ <file md5sum="d79254277f60751c4ba6697333af5d37" name="stubs/AMQPChannelException.php" role="doc" />
	+ <file md5sum="7c5888f281518863f2bf9adf6bae0d0c" name="stubs/AMQPConnection.php" role="doc" />
	+ <file md5sum="da1cd6ac1b51f2433904ce770e6f4ca3" name="stubs/AMQPConnectionException.php" role="doc" />
	+ <file md5sum="5b31c8b75a49b122fe72c32c8c1ff59a" name="stubs/AMQPEnvelope.php" role="doc" />
	+ <file md5sum="0b9b43b817a884d311f8f8013d8a5adc" name="stubs/AMQPException.php" role="doc" />
	+ <file md5sum="6382e8be47e1230bd769cf1b47451997" name="stubs/AMQPExchange.php" role="doc" />
	+ <file md5sum="7d1035c7a2b82f9187b10f05fe882eed" name="stubs/AMQPExchangeException.php" role="doc" />
	+ <file md5sum="f670cc7ecbb99576fa297ce55213d2ec" name="stubs/AMQPQueue.php" role="doc" />
	+ <file md5sum="d7da0562e86197fc6bb0d12af0a25495" name="stubs/AMQPQueueException.php" role="doc" />
	+ <file md5sum="62f984cea2d8bc5a06db4613512850fc" name="tests/_test_helpers.php.inc" role="test" />
	+ <file md5sum="a0301397259981c1946f7c59c01308dd" name="tests/amqpchannel_basicRecover.phpt" role="test" />
	+ <file md5sum="804eb9007733180f4300197288e7cd30" name="tests/amqpchannel_construct_basic.phpt" role="test" />
	+ <file md5sum="9c9cc955cdfd88e9824613aa90cc07aa" name="tests/amqpchannel_get_connection.phpt" role="test" />
	+ <file md5sum="fbb15ebdf594756a61ff250318fbecbc" name="tests/amqpchannel_getChannelId.phpt" role="test" />
	+ <file md5sum="01d45f7bd3a1c41cb967ff0e1008b968" name="tests/amqpchannel_multi_channel_connection.phpt" role="test" />
	+ <file md5sum="7ed3240775603a7ddbf37e6876e61e45" name="tests/amqpchannel_slots_usage.phpt" role="test" />
	+ <file md5sum="f1917f805476ef23a712b177a2663778" name="tests/amqpchannel_var_dump.phpt" role="test" />
	+ <file md5sum="6c380b88cdd43f18c4d2a9e226fe0b60" name="tests/amqpconnection_connect_login_failure.phpt" role="test" />
	+ <file md5sum="64c152378d6dea3efd16e59e64cdef55" name="tests/amqpconnection_construct_basic.phpt" role="test" />
	+ <file md5sum="5824298e6564f6e9231d196114d1c77e" name="tests/amqpconnection_construct_ini_read_timeout.phpt" role="test" />
	+ <file md5sum="5e6235fbdbc75cbd99cad1c0617a3269" name="tests/amqpconnection_construct_ini_timeout.phpt" role="test" />
	+ <file md5sum="97e9d595eab5d25db6bcbb050f9c5f19" name="tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt" role="test" />
	+ <file md5sum="cafbd1b8ec295026c37ac67a9e779b3c" name="tests/amqpconnection_construct_ini_timeout_default.phpt" role="test" />
	+ <file md5sum="756da50d19cbc4665b16efb389404421" name="tests/amqpconnection_construct_with_connect_timeout.phpt" role="test" />
	+ <file md5sum="042d3431112a369ac17a642d9fdc2b11" name="tests/amqpconnection_construct_with_limits.phpt" role="test" />
	+ <file md5sum="71943060ef1010289ab73222cc098cb0" name="tests/amqpconnection_construct_with_timeout.phpt" role="test" />
	+ <file md5sum="251f182e831e2ccfaf02fdc2f7babd58" name="tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt" role="test" />
	+ <file md5sum="6e7be2cf0ba67bdbd51b4549d4a05d95" name="tests/amqpconnection_construct_with_write_timeout.phpt" role="test" />
	+ <file md5sum="b23b3ac5c6d68ebd53e7b56f447b699a" name="tests/amqpconnection_getUsedChannels.phpt" role="test" />
	+ <file md5sum="8aa51481f9cfaa8164bd8d1de30cf38f" name="tests/amqpconnection_heartbeat.phpt" role="test" />
	+ <file md5sum="4f8d0a154106a45e1e25c43818b93b67" name="tests/amqpconnection_heartbeat_with_consumer.phpt" role="test" />
	+ <file md5sum="9e7f8576ff71311929ecae5119712906" name="tests/amqpconnection_persistent_construct_basic.phpt" role="test" />
	+ <file md5sum="cc14d8575873810f182d6a5caf88e9f1" name="tests/amqpconnection_persistent_in_use.phpt" role="test" />
	+ <file md5sum="cad266168a54c7b9aeddfe85c6f647b5" name="tests/amqpconnection_persistent_reusable.phpt" role="test" />
	+ <file md5sum="2cb04633b3e25285b16eba11c468091e" name="tests/amqpconnection_setHost.phpt" role="test" />
	+ <file md5sum="2d98d2921087152f05baf03b4c3d38f9" name="tests/amqpconnection_setLogin.phpt" role="test" />
	+ <file md5sum="b947e9a0862c329d77b3c1c359e06d1e" name="tests/amqpconnection_setPassword.phpt" role="test" />
	+ <file md5sum="b0d4fff032394ffac3b1f723eaa5aef3" name="tests/amqpconnection_setPort_int.phpt" role="test" />
	+ <file md5sum="7c24ac91124bd6bbffd3ef302cfd1721" name="tests/amqpconnection_setPort_out_of_range.phpt" role="test" />
	+ <file md5sum="f3851993f5d2be8bfd6093825c308b8e" name="tests/amqpconnection_setPort_string.phpt" role="test" />
	+ <file md5sum="8223be5940730e6ca06f80d2a7e7460e" name="tests/amqpconnection_setReadTimeout_float.phpt" role="test" />
	+ <file md5sum="8393a7fea7816e107d3e1c56d6511a6b" name="tests/amqpconnection_setReadTimeout_int.phpt" role="test" />
	+ <file md5sum="acc371cda24e1225060e2be3635e96c4" name="tests/amqpconnection_setReadTimeout_out_of_range.phpt" role="test" />
	+ <file md5sum="8f3d1d22f5af666600b19ec4d20e72d2" name="tests/amqpconnection_setReadTimeout_string.phpt" role="test" />
	+ <file md5sum="2887356c3bd4544d08f97f1266e9028d" name="tests/amqpconnection_setTimeout_deprecated.phpt" role="test" />
	+ <file md5sum="fca046c775db1ea3087458a1561c227a" name="tests/amqpconnection_setTimeout_float.phpt" role="test" />
	+ <file md5sum="40dfd77c4c08f8528951d47e42cda7fb" name="tests/amqpconnection_setTimeout_int.phpt" role="test" />
	+ <file md5sum="d0cd2aa004803b2f05ab467edf4f1036" name="tests/amqpconnection_setTimeout_out_of_range.phpt" role="test" />
	+ <file md5sum="28ef38b64e446ac2dfcc748862387ceb" name="tests/amqpconnection_setTimeout_string.phpt" role="test" />
	+ <file md5sum="b045ae9098ff06a00ee7146d8d413a69" name="tests/amqpconnection_setVhost.phpt" role="test" />
	+ <file md5sum="1b5380a431ebf72b2c0b8a5f6e370721" name="tests/amqpconnection_setWriteTimeout_float.phpt" role="test" />
	+ <file md5sum="eb34d68a4069135dac436bf2b3cf2b8f" name="tests/amqpconnection_setWriteTimeout_int.phpt" role="test" />
	+ <file md5sum="1557d33bc6c620c3cb6f64aefec95eb6" name="tests/amqpconnection_setWriteTimeout_out_of_range.phpt" role="test" />
	+ <file md5sum="63efc639ba17621d65facd6a957e4a3e" name="tests/amqpconnection_setWriteTimeout_string.phpt" role="test" />
	+ <file md5sum="f27e48180e45ffaff7fc2945b2bb6718" name="tests/amqpconnection_toomanychannels.phpt" role="test" />
	+ <file md5sum="d98dda1d117bd865e8f66528e1b0fc04" name="tests/amqpconnection_var_dump.phpt" role="test" />
	+ <file md5sum="8f90f050a53b2282dd5a128b59090c04" name="tests/amqpenvelope_construct.phpt" role="test" />
	+ <file md5sum="161808887e2fe1de616358d317e2e864" name="tests/amqpenvelope_get_accessors.phpt" role="test" />
	+ <file md5sum="c68a52e419cf2eae84b2b06ed67668fd" name="tests/amqpenvelope_var_dump.phpt" role="test" />
	+ <file md5sum="30f0ddcd3250d0c6d95cad54ae7d0f29" name="tests/amqpexchange_attributes.phpt" role="test" />
	+ <file md5sum="3cdd27b9ac134c99278e13a7783ee0bf" name="tests/amqpexchange_bind.phpt" role="test" />
	+ <file md5sum="a8d465a0ba6d926e77b03a0af44972d8" name="tests/amqpexchange_bind_with_arguments.phpt" role="test" />
	+ <file md5sum="0d1917327d0be2a106107fd40da240c2" name="tests/amqpexchange_bind_without_key.phpt" role="test" />
	+ <file md5sum="14d8f19aaa7ef5dfc6433a69ad1392f7" name="tests/amqpexchange_bind_without_key_with_arguments.phpt" role="test" />
	+ <file md5sum="5c0c19fbe0080234182f77b88f8a3b49" name="tests/amqpexchange_channel_refcount.phpt" role="test" />
	+ <file md5sum="e14bc6d3e6bf2db658522fd880ff8342" name="tests/amqpexchange_construct_basic.phpt" role="test" />
	+ <file md5sum="978a4d0d8bf603990e99d686d6298dcf" name="tests/amqpexchange_declare_basic.phpt" role="test" />
	+ <file md5sum="e910acd5d274bb722be2e4c5c564eacf" name="tests/amqpexchange_declare_existent.phpt" role="test" />
	+ <file md5sum="f23ce6bce7828675f4ab2229ff909b09" name="tests/amqpexchange_declare_without_name.phpt" role="test" />
	+ <file md5sum="c11306122ecaee5dd84ab45ba1c83fc2" name="tests/amqpexchange_declare_without_type.phpt" role="test" />
	+ <file md5sum="8e5fb0edb96401eb40b02fa96403231b" name="tests/amqpexchange_get_channel.phpt" role="test" />
	+ <file md5sum="f7576d0cfaba1da1861438f9372cb221" name="tests/amqpexchange_get_connection.phpt" role="test" />
	+ <file md5sum="bf2e1921405cd73178fba23fdc94812c" name="tests/amqpexchange_invalid_type.phpt" role="test" />
	+ <file md5sum="28d40d0147069b95f19370dabcc05d51" name="tests/amqpexchange_publish_basic.phpt" role="test" />
	+ <file md5sum="4d07c2070b00e062b8dbeb3ba47e7423" name="tests/amqpexchange_publish_empty_routing_key.phpt" role="test" />
	+ <file md5sum="ad68e777e537d8610bab90d3fcb8eb50" name="tests/amqpexchange_publish_timeout.disabled" role="test" />
	+ <file md5sum="22b69d2bfab58d6d710ee796c04a91fd" name="tests/amqpexchange_publish_with_null.phpt" role="test" />
	+ <file md5sum="8127175c0c129fd4d6359636f058bc21" name="tests/amqpexchange_publish_with_properties.phpt" role="test" />
	+ <file md5sum="100a493cfe499876c744c6320021f6d5" name="tests/amqpexchange_publish_with_properties_ignore_num_header.phpt" role="test" />
	+ <file md5sum="e70ffc740233f2a84d6e98234584c195" name="tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt" role="test" />
	+ <file md5sum="fe5c26b2041d25fd4b5895c84c6ceee1" name="tests/amqpexchange_publish_with_properties_nested_header.phpt" role="test" />
	+ <file md5sum="4137d0f1d5b6a9e6a9cf08a0f25bd3fc" name="tests/amqpexchange_publish_with_properties_user_id_failure.phpt" role="test" />
	+ <file md5sum="6692eef7a0bb10e53ef74e1809e3dd85" name="tests/amqpexchange_set_flag.phpt" role="test" />
	+ <file md5sum="72246bd590a606e6c6241cfb4276a1d2" name="tests/amqpexchange_set_flags.phpt" role="test" />
	+ <file md5sum="d492b21a3377b56f412fc5e7598cc9f6" name="tests/amqpexchange_setArgument.phpt" role="test" />
	+ <file md5sum="647497c26f3df6a927848a51bb871fc8" name="tests/amqpexchange_unbind.phpt" role="test" />
	+ <file md5sum="f638c9fc507429242b9ddcd775f99abc" name="tests/amqpexchange_unbind_with_arguments.phpt" role="test" />
	+ <file md5sum="db754e7e6d2dba44ab49f92b736e1de4" name="tests/amqpexchange_unbind_without_key.phpt" role="test" />
	+ <file md5sum="497f46c611f6520f68a56f244a594a4b" name="tests/amqpexchange_unbind_without_key_with_arguments.phpt" role="test" />
	+ <file md5sum="a9f0f43687589217617202ee6c42c839" name="tests/amqpexchange_var_dump.phpt" role="test" />
	+ <file md5sum="e4497ed4ca0eb82c5c757714adbcc922" name="tests/amqpqueue_attributes.phpt" role="test" />
	+ <file md5sum="4a0a5a690b1f784d85bd040302575a3d" name="tests/amqpqueue_bind_basic.phpt" role="test" />
	+ <file md5sum="da143124281d829386f617269ec93fcf" name="tests/amqpqueue_bind_basic_empty_routing_key.phpt" role="test" />
	+ <file md5sum="de63dbee4f05ec49ce48ec198b843f4b" name="tests/amqpqueue_bind_basic_headers_arguments.phpt" role="test" />
	+ <file md5sum="9b39051f8ef3472bb23b9748da28314d" name="tests/amqpqueue_cancel.phpt" role="test" />
	+ <file md5sum="2fc0d97c30d609f40b7c85f529d3f752" name="tests/amqpqueue_construct_basic.phpt" role="test" />
	+ <file md5sum="3afae78709d63c465942a12b87e4be7a" name="tests/amqpqueue_consume_basic.phpt" role="test" />
	+ <file md5sum="e772e975f5b3d44935e6bb7766ad88e1" name="tests/amqpqueue_consume_multiple.phpt" role="test" />
	+ <file md5sum="5e36e341a8797edeee72397d8adcb7bb" name="tests/amqpqueue_consume_multiple_no_doubles.phpt" role="test" />
	+ <file md5sum="3cfe9025a23532d552f23fc54d2826d8" name="tests/amqpqueue_consume_nonexistent.phpt" role="test" />
	+ <file md5sum="036b629ee10295b0807c73719f22c27f" name="tests/amqpqueue_consume_timeout.phpt" role="test" />
	+ <file md5sum="52fff1bf831ded585e3f8819504204b8" name="tests/amqpqueue_declare_basic.phpt" role="test" />
	+ <file md5sum="443dfd9d12d9a3e204c37938011889a5" name="tests/amqpqueue_declare_with_arguments.phpt" role="test" />
	+ <file md5sum="589544992486dc8be9060c3a9ed0c531" name="tests/amqpqueue_delete_basic.phpt" role="test" />
	+ <file md5sum="5f559bb943f89d6d2b7f5ab1a85dc42b" name="tests/amqpqueue_empty_name.phpt" role="test" />
	+ <file md5sum="0ad1ccd80ce1b4e8ba724b5938d55f8b" name="tests/amqpqueue_get_basic.phpt" role="test" />
	+ <file md5sum="6cce48f3831c2d78e92ef263097386d9" name="tests/amqpqueue_get_channel.phpt" role="test" />
	+ <file md5sum="5d764f35a9635bd532e9af55f6e63f41" name="tests/amqpqueue_get_connection.phpt" role="test" />
	+ <file md5sum="3148d357f550c22bd83ec5339ca63133" name="tests/amqpqueue_get_empty_body.phpt" role="test" />
	+ <file md5sum="512095e9f3e98adc9ffd3a5406920c62" name="tests/amqpqueue_get_headers.phpt" role="test" />
	+ <file md5sum="a591a624eb357a0ef50fc71f0465974d" name="tests/amqpqueue_get_nonexistent.phpt" role="test" />
	+ <file md5sum="0f586fa4ee026cef30cf5d330af1133e" name="tests/amqpqueue_nack.phpt" role="test" />
	+ <file md5sum="c61d7596374c94b3adc4fab185d00c80" name="tests/amqpqueue_nested_arrays.phpt" role="test" />
	+ <file md5sum="48b536f91b376a32aad882a14ad26b59" name="tests/amqpqueue_nested_headers.phpt" role="test" />
	+ <file md5sum="abaf080a5feab914919e8bcf837e9d83" name="tests/amqpqueue_purge_basic.phpt" role="test" />
	+ <file md5sum="300752e855d987475b120082400677c0" name="tests/amqpqueue_setArgument.phpt" role="test" />
	+ <file md5sum="cc8d6bd67a59536e3a92a3550016e82e" name="tests/amqpqueue_unbind_basic_empty_routing_key.phpt" role="test" />
	+ <file md5sum="49ab1e6c77ed9331b5371c04faf95653" name="tests/amqpqueue_unbind_basic_headers_arguments.phpt" role="test" />
	+ <file md5sum="6b98df625b9028965720fcfde8a5042e" name="tests/amqpqueue_var_dump.phpt" role="test" />
	+ <file md5sum="efbcc35b58c7b65064660ca65fb1f8da" name="tests/bug_17831.phpt" role="test" />
	+ <file md5sum="d85e785d26e265b242b94af5ed2fa046" name="tests/bug_19707.phpt" role="test" />
	+ <file md5sum="aac2b2dbbea1bef2322ac549e416ca38" name="tests/bug_19840.phpt" role="test" />
	+ <file md5sum="cbbb08c5c32b68a0b42a59a9d760c4a7" name="tests/bug_61533.phpt" role="test" />
	+ <file md5sum="70c4b1222072be9591ff0f2d6bd4a0c9" name="tests/bug_62354.phpt" role="test" />
	+ <file md5sum="764b70058dc0694eb7060c50f9bda611" name="tests/bug_gh50-1.phpt" role="test" />
	+ <file md5sum="61c947c8bcc32226f09c845f1ca69734" name="tests/bug_gh50-2.phpt" role="test" />
	+ <file md5sum="555901187984375d0eda9fd2aa5fb9ed" name="tests/bug_gh50-3.phpt" role="test" />
	+ <file md5sum="c791ab105f32830962f2961745dc433e" name="tests/bug_gh50-4.phpt" role="test" />
	+ <file md5sum="6dab7744024b4d6258141513c15ed102" name="tests/bug_gh53.phpt" role="test" />
	+ <file md5sum="b7c71b6b0c0653eafe9f8caa15335975" name="tests/bug_gh53-2.phpt" role="test" />
	+ <file md5sum="d8de8918a3c73ebdcb4159581ea58b5f" name="tests/bug_gh72-1.phpt" role="test" />
	+ <file md5sum="0bed5ba885ea925a6045502569a1e946" name="tests/bug_gh72-2.phpt" role="test" />
	+ <file md5sum="4f646dfe852ca88d292c987b4b16a71f" name="tests/bug_gh147.phpt" role="test" />
	+ <file md5sum="6157e371b447ebf125b36340ebbac39c" name="tests/bug_gh155_direct_reply_to.phpt" role="test" />
	+ <file md5sum="212e44c003f3b950b3f85958fdc5a367" name="tests/package-version.phpt" role="test" />
	+ </dir>
	+ </contents>
	+ <dependencies>
	+ <required>
	+ <php>
	+ <min>5.2.0</min>
	+ </php>
	+ <pearinstaller>
	+ <min>1.4.0</min>
	+ </pearinstaller>
	+ </required>
	+ </dependencies>
	+ <providesextension>amqp</providesextension>
	+ <extsrcrelease>
	+ <configureoption default="autodetect" name="with-librabbitmq-dir" prompt="Set the path to librabbitmq install prefix" />
	+ </extsrcrelease>
	+ <changelog>
	+ <release>
	+ <version>
	+ <release>1.6.0</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2015-11-03</date>
	+ <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD style</license>
	+ <notes>
	1.6.0 Release:
	* Various build fixes (Remi Collet)
	* librabbitmq 0.5 compatibility (Remi Collet)

	For a complete list of changes see:
	https://github.com/pdezwart/php-amqp/compare/v1.6.0beta4...v1.6.0
	-
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.6.0beta4</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2015-09-18</date>
	+ <notes>
	1.6.0beta4 Release:
	- * Add ability to re-attach consuming callback (Bogdan Padalko)
	- * Add AMQPQueue::getConsumerTag() method and fix consumer tag handling in AMQPQueue class methods (Bogdan Padalko)
	- * Add channel_max, frame_max and hearbeat support (see AMQPConnection::__construct() method) (librabbitmq version >= 0.6.0 required) (Bogdan Padalko)
	- * Fix issue with message truncating to first null-byte during sending (Bogdan Padalko, special thanks to Alex Kazinskiy, Alvaro Videla and Michael Klishin)
	- * Fix issue with message truncating to first null-byte during sending (Bogdan Padalko)
	- * Fix invalid delivery mode returned by AMQPEnvelop::getDeliveryMode (Bogdan Padalko)
	-
	- For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.6.0beta3...v1.6.0beta4
	+ * Add ability to re-attach consuming callback (Bogdan Padalko)
	+ * Add AMQPQueue::getConsumerTag() method and fix consumer tag handling in AMQPQueue class methods (Bogdan Padalko)
	+ * Add channel_max, frame_max and hearbeat support (see AMQPConnection::__construct() method) (librabbitmq version >= 0.6.0 required) (Bogdan Padalko)
	+ * Fix issue with message truncating to first null-byte during sending (Bogdan Padalko, special thanks to Alex Kazinskiy, Alvaro Videla and Michael Klishin)
	+ * Fix issue with message truncating to first null-byte during sending (Bogdan Padalko)
	+ * Fix invalid delivery mode returned by AMQPEnvelop::getDeliveryMode (Bogdan Padalko)

	+ For a complete list of changes see:
	+ https://github.com/pdezwart/php-amqp/compare/v1.6.0beta3...v1.6.0beta4
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.6.0beta3</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2015-04-18</date>
	+ <notes>
	1.6.0beta3 Release:
	- * Add basic.recover AMQP method support (see AMQPChannel::basicRecover() method) (Bogdan Padalko)
	- * Fix building on OS X (Bogdan Padalko)
	-
	- For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.6.0beta2...v1.6.0beta3
	+ * Add basic.recover AMQP method support (see AMQPChannel::basicRecover() method) (Bogdan Padalko)
	+ * Fix building on OS X (Bogdan Padalko)

	+ For a complete list of changes see:
	+ https://github.com/pdezwart/php-amqp/compare/v1.6.0beta2...v1.6.0beta3
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.6.0beta2</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2015-01-27</date>
	+ <notes>
	1.6.0beta2 Release:
	* Pulled 1.6.0beta1, as it had the stable tag

	- For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.6.0beta1...v1.6.0beta2
	-
	-1.6.0beta1 Release:
	* Add support for nested arguments values (Bogdan Padalko)
	* Add auto_delete and internal flags support for AMQPExchange::declare (librabbitmq version > 0.5.2 required) (Bogdan Padalko)
	* Fix persistence support (Bogdan Padalko)
	* Add AMQPExchange::unbind method and fix AMQPExchange::bind method. WARNING: this can potentially break BC (Bogdan Padalko)
	* Add support to consume messages from multiple queues (Bogdan Padalko)
	* Add AMQP_DURABLE flag support to AMQPExchange::setFlags (librabbitmq version > 0.5.2 required) (Bogdan Padalko)
	* Fix inconsistent INI values comparison which leads to deprecation warnings (Bogdan Padalko)
	* Various segfault and memory leak fixes (Bogdan Padalko)

	- For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.4.0...v1.6.0beta1
	-
	+ For a complete list of changes see:
	+ https://github.com/pdezwart/php-amqp/compare/v1.4.0...v1.6.0beta2
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.4.0</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2014-04-14</date>
	+ <notes>
	1.4.0 Release:
	* Fix #72: Publishing to an exchange with an empty name is valid and should not throw an exception (lstrojny)
	* Fix #77: AMQPQueue::delete() now no longer returns a boolean, but an integer of how many messages were deleted. WARNING: this can potentially break BC (Bogdan Padalko)
	* Fix #75: adhering to the AMQP spec by closing channel and sometimes even the connection in case of certain errors (Bogdan Padalko)
	* Fix #81: Add optional arguments parameter to bind()/unbind() (Michael Squires)
	* Fix #82: additional getters (getChannel(), getConnection()) (Bogdan Padalko)
	* Fix #92: fix various memory leaks in the AMQPConnection class (Lars Strojny)
	* Using amqp_error_string2() instead of deprecated amqp_error_string() (Lars Strojny)
	* Fix memory leaks in setHost, setLogin, setPassword, setVhost (Lars Strojny, Bogdan Padalko)
	* Fixed a memleak in php_amqp_connect (Julien Pauli)
	* Use rabbitmq-c defaults for max channels and default frame size (Bogdan Padalko)
	* Fix socket timeout error when connecting over high-latency network (Bogdan Padalko)

	For a complete list of changes see:
	- https://github.com/pdezwart/php-amqp/compare/v1.3.0...v1.4.0
	+ https://github.com/pdezwart/php-amqp/compare/v1.4.0beta2...v1.4.0
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.4.0beta2</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2014-03-08</date>
	+ <notes>
	+1.4.0beta2 Release:
	+ * -
	+
	+ For a complete list of changes see:
	+ https://github.com/pdezwart/php-amqp/compare/v1.4.0beta1...v1.4.0beta2
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.4.0beta1</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2014-01-15</date>
	+ <notes>
	+1.4.0beta1 Release:
	+ * -

	+ For a complete list of changes see:
	+ https://github.com/pdezwart/php-amqp/compare/v1.3.0...v1.4.0beta1
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.3.0</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2013-11-25</date>
	+ <notes>
	1.3.0 Release:
	* Allow retrieving auto-delete exchanges (Guilherme Blanco)
	* Add connection timeout support. This requires bumping the version requirement for librabbitmq to >= 0.4.1 (Bogdan Padalko)

	For a complete list of changes see:
	https://github.com/pdezwart/php-amqp/compare/v1.2.0...v1.3.0
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.2.0</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2013-05-28</date>
	+ <notes>
	1.2.0 Release:
	* New methods AMQPChannel::getPrefetchCount() and AMQPChannel::getPrefetchSize()
	* Deprecate AMQPQueue::declare() in favor of AMQPQueue::declareQueue()
	* Deprecate AMQPExchange::declare() in favor of AMQPExchange::declareExchange()
	* Smaller fixes to our stubs

	For a complete list of changes see:
	https://github.com/pdezwart/php-amqp/compare/v1.0.10...v1.2.0
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.10</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2013-05-28</date>
	+ <notes>
	1.0.10 Release:
	* report correct version in module info (Lars Strojny)
	* fix class interface definitions (Vladimir Kartaviy)
	* add ability to bind a queue with an empty routing key (Vladimir Kartaviy)
	* fix constant AMQP_IFUNUSED (Florin Patan, Bernhard Weisshuhn)
	* added stubs for ide use (Vladimir Kartaviy, Bernhard Weisshuhn)
	* Fixed memory leak in queue->declareQueue (Ilya a.k.a. coodix)
	* support for php 5.5 (Lars Strojny)
	* add support for read and write timeouts (Bogdan Padalko)
	* fix memory leak in queue->consume (Dmitry Vinogradov)
	* add support for custom exchange types (empi89)
	* support for nested custom headers (Bernhard Weisshuhn)
	* fix memory (Bernhard Weisshuhn)

	For a complete list of changes see:
	https://github.com/pdezwart/php-amqp/compare/v1.0.9...v1.0.10
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.9</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-11-13</date>
	+ <notes>
	1.0.9 Release:
	* Fix pecl relase
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.8</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-11-12</date>
	+ <notes>
	1.0.8 Release:
	* Skip var_dump test on PHP 5.2
	* Initialize consumer tag string length to zero
	* Support connection time outs
	* Adding consumer_tag parameter to AMQPQueue::cancel
	* Clean up error code handling
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.7</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-09-10</date>
	+ <notes>
	+1.0.7 Release:
	+ * Adding missing macros
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.6</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-09-10</date>
	+ <notes>
	1.0.6 Release:
	* 62354: Segmentation fault when printing or dumping an object that contains an AMQP object
	* Adding in missing tests
	* Fixing release number in PHP information
	* Adding .gitignore info for Git users
	* Cleaning up debug handling
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.5</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-08-26</date>
	+ <notes>
	1.0.5 Release:
	* 62696: Incorrect exchange type
	* Handles server connections being closed during consume and publish correctly
	* 62628: Exception thrown in consume will lock PHP
	* 61533: Segmentation fault when instantiating channel, queue or exchange with wrong object, then using it
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.4</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-07-18</date>
	+ <notes>
	1.0.4 Release:
	* 62549: Fixing broken persistent connection
	* 62412: Fixing segfault due to destruction order
	* 62411: Fixing declaration overload bug
	* 62410: Fixing declaration overload for 5.4
	* 61337: Adding License file
	* 61749: Fixing handling for binary content in envelope
	* 62087: Adding appropriate version information
	* 62354: Enabling debugging dumping of objects
	* 61351: Updating min PHP version requirements to 5.2.0
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.3</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-05-19</date>
	+ <notes>
	1.0.3 Release:
	* Fixing compilation issue with PHP 5.4
	-
	-1.0.2 Release:
	-Fixed bug:
	* Memory leak when using AMQPQueue::get from a queue with no messages
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.1</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-03-02</date>
	+ <notes>
	1.0.1 Release:
	Fixed bug:
	* 61247: Allow queue creation with empty queue name, and return auto generated name
	* 61127: Segmentation fault when cleaning up an AMQPChannel without calling AMQPConnection::connect first
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>1.0.0</release>
	+ <api>1.0.0</api>
	+ </version>
	+ <stability>
	+ <release>stable</release>
	+ <api>stable</api>
	+ </stability>
	+ <date>2012-02-15</date>
	+ <notes>
	1.0.0 Release:
	Changed/finalized API signature:
	* Exposing AMQPChannel
	* Exposing AMQPEnvelope
	* Exposing more queue and exchange arguments and flags
	* Exposing basic.qos
	Added persistent connections
	Cleaned up codebase
	Fixed memory leaks and segmentation faults
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.3.1</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2011-09-08</date>
	+ <notes>
	0.3.1 Release:
	Fixed bug:
	* 24323: Cannot get the name for auto-named reply-to queues
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.3.0</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2011-06-09</date>
	+ <notes>
	0.3.0 Release:
	Fixed memory leaks in many functions (courtesy Jonathan Tansavatdi and Andy Wick)
	Fixed consume method to return proper values
	Cleaned up variable usage
	Fixed bugs:
	* 22638: Unexpected exit code 1 with AMQPQueue::consume()
	* 22698: AMQPQueue::consume
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.2.2</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2011-01-02</date>
	+ <notes>
	0.2.2 Release:
	Made extension compatible with PHP lt 5.3 (courtesy John Skopis)
	Fixed wrong typing of message properties (courtesy John Skopis)
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.2.1</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2010-12-10</date>
	+ <notes>
	0.2.1 Release:
	Fixed refcount decrementing bug causing segfaults.
	-
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.2.0</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2010-12-10</date>
	+ <notes>
	0.2.0 Release:
	Works with AMQP 0-8 and 0-9-1 (used by RabbitMQ 2.*)
	Modified AMQPConnection object:
	* Requires call to 'connect' method to connect (no longer connects on instantiation)
	* Added support for disconnect and reconnect
	* Added helper setters for port, host, vhost, login and password
	Improved consume method to block for MIN messages, and try to get MAX messages if available
	Fixed zval descoping bugs
	Fixed bugs:
	* 17809: Couldn't compile pecl extension under PHP 5.3
	* 17831: Segmentation fault when the exchange doesn't exists
	* 19707: AMQPQueue::get() doesn't return the message
	* 19840: Connection Exception
	- </notes>
	- <contents>
	- <dir name="/">
	- <file md5sum="35dd03a933dc4b3faaa54ea7badc3dfc" name="amqp.c" role="src" />
	- <file md5sum="27869c52fb2800b14772cb3eb5034768" name="amqp_channel.c" role="src" />
	- <file md5sum="fdb8b53b626109d312fbe7ad9f99f3ea" name="amqp_connection.c" role="src" />
	- <file md5sum="7f0a52d3e37412747c4a59bfcab2788c" name="amqp_connection_resource.c" role="src" />
	- <file md5sum="13e263066c72a311bd463519cfae93ba" name="amqp_envelope.c" role="src" />
	- <file md5sum="fa38dd4d4df65fddb7a1d24676206a2a" name="amqp_exchange.c" role="src" />
	- <file md5sum="c33552d23da16d01b106911bf51fb0d0" name="amqp_object_store.c" role="src" />
	- <file md5sum="e6b7842d73e3188ae6d5f2523320a008" name="amqp_queue.c" role="src" />
	- <file md5sum="391d67736e0fbffcdc4e3af0fcc111bd" name="config.m4" role="src" />
	- <file md5sum="1518f35a7beb49a2d83575eaa1b84865" name="config.w32" role="src" />
	- <file md5sum="c2bc5a8aa3fb7f8d0c924f584e20809d" name="CREDITS" role="doc" />
	- <file md5sum="b3e70313289e3ea66cae3089b7e571b8" name="LICENSE" role="doc" />
	- <file md5sum="c0fcf8d2c35a0e27a0c338780e579861" name="amqp_channel.h" role="src" />
	- <file md5sum="02fb9c54a6fc70e0c3219e1eedd7a967" name="amqp_connection.h" role="src" />
	- <file md5sum="56659de12f9e0374f711048f9d3efdec" name="amqp_connection_resource.h" role="src" />
	- <file md5sum="5e84967d3642c45730286ab3e5bd5215" name="amqp_envelope.h" role="src" />
	- <file md5sum="24f3dae0ed8629dbf29aec2b18f1e348" name="amqp_exchange.h" role="src" />
	- <file md5sum="ddb57bd20a3b14932317c42112dc4e33" name="amqp_object_store.h" role="src" />
	- <file md5sum="c933137201a5d1cbe6bee01512c847cb" name="amqp_queue.h" role="src" />
	- <file md5sum="d396883b9b0c91bbd7b1294fe3ce8cca" name="php_amqp.h" role="src" />
	- <file md5sum="a0301397259981c1946f7c59c01308dd" name="tests/amqpchannel_basicRecover.phpt" role="test" />
	- <file md5sum="804eb9007733180f4300197288e7cd30" name="tests/amqpchannel_construct_basic.phpt" role="test" />
	- <file md5sum="9c9cc955cdfd88e9824613aa90cc07aa" name="tests/amqpchannel_get_connection.phpt" role="test" />
	- <file md5sum="01d45f7bd3a1c41cb967ff0e1008b968" name="tests/amqpchannel_multi_channel_connection.phpt" role="test" />
	- <file md5sum="7ed3240775603a7ddbf37e6876e61e45" name="tests/amqpchannel_slots_usage.phpt" role="test" />
	- <file md5sum="9bfa66a3547041631bd59c7f170a1cc1" name="tests/amqpchannel_var_dump.phpt" role="test" />
	- <file md5sum="6c380b88cdd43f18c4d2a9e226fe0b60" name="tests/amqpconnection_connect_login_failure.phpt" role="test" />
	- <file md5sum="977f81cbd4431c61d5292f91d21d4b61" name="tests/amqpconnection_construct_basic.phpt" role="test" />
	- <file md5sum="5824298e6564f6e9231d196114d1c77e" name="tests/amqpconnection_construct_ini_read_timeout.phpt" role="test" />
	- <file md5sum="5e6235fbdbc75cbd99cad1c0617a3269" name="tests/amqpconnection_construct_ini_timeout.phpt" role="test" />
	- <file md5sum="97e9d595eab5d25db6bcbb050f9c5f19" name="tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt" role="test" />
	- <file md5sum="cafbd1b8ec295026c37ac67a9e779b3c" name="tests/amqpconnection_construct_ini_timeout_default.phpt" role="test" />
	- <file md5sum="756da50d19cbc4665b16efb389404421" name="tests/amqpconnection_construct_with_connect_timeout.phpt" role="test" />
	- <file md5sum="71943060ef1010289ab73222cc098cb0" name="tests/amqpconnection_construct_with_timeout.phpt" role="test" />
	- <file md5sum="251f182e831e2ccfaf02fdc2f7babd58" name="tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt" role="test" />
	- <file md5sum="6e7be2cf0ba67bdbd51b4549d4a05d95" name="tests/amqpconnection_construct_with_write_timeout.phpt" role="test" />
	- <file md5sum="d7018287bc6dca5fb5d0a8bff4a1c922" name="tests/amqpconnection_persistent_construct_basic.phpt" role="test" />
	- <file md5sum="cc14d8575873810f182d6a5caf88e9f1" name="tests/amqpconnection_persistent_in_use.phpt" role="test" />
	- <file md5sum="9d10b0e4d17a0f79e8e0c493e9f1dda1" name="tests/amqpconnection_persistent_reusable.phpt" role="test" />
	- <file md5sum="c0ec41c937366128d259d01ee3061b31" name="tests/amqpconnection_persistent_var_dump.phpt" role="test" />
	- <file md5sum="2cb04633b3e25285b16eba11c468091e" name="tests/amqpconnection_setHost.phpt" role="test" />
	- <file md5sum="2d98d2921087152f05baf03b4c3d38f9" name="tests/amqpconnection_setLogin.phpt" role="test" />
	- <file md5sum="b947e9a0862c329d77b3c1c359e06d1e" name="tests/amqpconnection_setPassword.phpt" role="test" />
	- <file md5sum="b0d4fff032394ffac3b1f723eaa5aef3" name="tests/amqpconnection_setPort_int.phpt" role="test" />
	- <file md5sum="7c24ac91124bd6bbffd3ef302cfd1721" name="tests/amqpconnection_setPort_out_of_range.phpt" role="test" />
	- <file md5sum="f3851993f5d2be8bfd6093825c308b8e" name="tests/amqpconnection_setPort_string.phpt" role="test" />
	- <file md5sum="8223be5940730e6ca06f80d2a7e7460e" name="tests/amqpconnection_setReadTimeout_float.phpt" role="test" />
	- <file md5sum="8393a7fea7816e107d3e1c56d6511a6b" name="tests/amqpconnection_setReadTimeout_int.phpt" role="test" />
	- <file md5sum="acc371cda24e1225060e2be3635e96c4" name="tests/amqpconnection_setReadTimeout_out_of_range.phpt" role="test" />
	- <file md5sum="8f3d1d22f5af666600b19ec4d20e72d2" name="tests/amqpconnection_setReadTimeout_string.phpt" role="test" />
	- <file md5sum="2887356c3bd4544d08f97f1266e9028d" name="tests/amqpconnection_setTimeout_deprecated.phpt" role="test" />
	- <file md5sum="fca046c775db1ea3087458a1561c227a" name="tests/amqpconnection_setTimeout_float.phpt" role="test" />
	- <file md5sum="40dfd77c4c08f8528951d47e42cda7fb" name="tests/amqpconnection_setTimeout_int.phpt" role="test" />
	- <file md5sum="d0cd2aa004803b2f05ab467edf4f1036" name="tests/amqpconnection_setTimeout_out_of_range.phpt" role="test" />
	- <file md5sum="28ef38b64e446ac2dfcc748862387ceb" name="tests/amqpconnection_setTimeout_string.phpt" role="test" />
	- <file md5sum="b045ae9098ff06a00ee7146d8d413a69" name="tests/amqpconnection_setVhost.phpt" role="test" />
	- <file md5sum="1b5380a431ebf72b2c0b8a5f6e370721" name="tests/amqpconnection_setWriteTimeout_float.phpt" role="test" />
	- <file md5sum="eb34d68a4069135dac436bf2b3cf2b8f" name="tests/amqpconnection_setWriteTimeout_int.phpt" role="test" />
	- <file md5sum="1557d33bc6c620c3cb6f64aefec95eb6" name="tests/amqpconnection_setWriteTimeout_out_of_range.phpt" role="test" />
	- <file md5sum="63efc639ba17621d65facd6a957e4a3e" name="tests/amqpconnection_setWriteTimeout_string.phpt" role="test" />
	- <file md5sum="f27e48180e45ffaff7fc2945b2bb6718" name="tests/amqpconnection_toomanychannels.phpt" role="test" />
	- <file md5sum="02ba7a1c003ebf0b8888f04cc6133ed7" name="tests/amqpconnection_var_dump.phpt" role="test" />
	- <file md5sum="528ae67de535a92e62cd5a7a7974cea3" name="tests/amqpenvelope_get_accessors.phpt" role="test" />
	- <file md5sum="bc1c52e4d1e459c8a60aa2fe6175f96f" name="tests/amqpenvelope_var_dump.phpt" role="test" />
	- <file md5sum="3cdd27b9ac134c99278e13a7783ee0bf" name="tests/amqpexchange_bind.phpt" role="test" />
	- <file md5sum="a8d465a0ba6d926e77b03a0af44972d8" name="tests/amqpexchange_bind_with_arguments.phpt" role="test" />
	- <file md5sum="0d1917327d0be2a106107fd40da240c2" name="tests/amqpexchange_bind_without_key.phpt" role="test" />
	- <file md5sum="14d8f19aaa7ef5dfc6433a69ad1392f7" name="tests/amqpexchange_bind_without_key_with_arguments.phpt" role="test" />
	- <file md5sum="5c0c19fbe0080234182f77b88f8a3b49" name="tests/amqpexchange_channel_refcount.phpt" role="test" />
	- <file md5sum="e14bc6d3e6bf2db658522fd880ff8342" name="tests/amqpexchange_construct_basic.phpt" role="test" />
	- <file md5sum="978a4d0d8bf603990e99d686d6298dcf" name="tests/amqpexchange_declare_basic.phpt" role="test" />
	- <file md5sum="e910acd5d274bb722be2e4c5c564eacf" name="tests/amqpexchange_declare_existent.phpt" role="test" />
	- <file md5sum="8e5fb0edb96401eb40b02fa96403231b" name="tests/amqpexchange_get_channel.phpt" role="test" />
	- <file md5sum="f7576d0cfaba1da1861438f9372cb221" name="tests/amqpexchange_get_connection.phpt" role="test" />
	- <file md5sum="bf2e1921405cd73178fba23fdc94812c" name="tests/amqpexchange_invalid_type.phpt" role="test" />
	- <file md5sum="28d40d0147069b95f19370dabcc05d51" name="tests/amqpexchange_publish_basic.phpt" role="test" />
	- <file md5sum="4d07c2070b00e062b8dbeb3ba47e7423" name="tests/amqpexchange_publish_empty_routing_key.phpt" role="test" />
	- <file md5sum="3104f4df0061613ca1b2fa958cddbe17" name="tests/amqpexchange_publish_with_properties.phpt" role="test" />
	- <file md5sum="100a493cfe499876c744c6320021f6d5" name="tests/amqpexchange_publish_with_properties_ignore_num_header.phpt" role="test" />
	- <file md5sum="e70ffc740233f2a84d6e98234584c195" name="tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt" role="test" />
	- <file md5sum="1c5594bea4a280b282e1cf0a3c3454c1" name="tests/amqpexchange_publish_with_properties_nested_header.phpt" role="test" />
	- <file md5sum="4137d0f1d5b6a9e6a9cf08a0f25bd3fc" name="tests/amqpexchange_publish_with_properties_user_id_failure.phpt" role="test" />
	- <file md5sum="6692eef7a0bb10e53ef74e1809e3dd85" name="tests/amqpexchange_set_flag.phpt" role="test" />
	- <file md5sum="88f38d2d9512e48022d36605eb6fd282" name="tests/amqpexchange_set_flags.phpt" role="test" />
	- <file md5sum="647497c26f3df6a927848a51bb871fc8" name="tests/amqpexchange_unbind.phpt" role="test" />
	- <file md5sum="f638c9fc507429242b9ddcd775f99abc" name="tests/amqpexchange_unbind_with_arguments.phpt" role="test" />
	- <file md5sum="db754e7e6d2dba44ab49f92b736e1de4" name="tests/amqpexchange_unbind_without_key.phpt" role="test" />
	- <file md5sum="497f46c611f6520f68a56f244a594a4b" name="tests/amqpexchange_unbind_without_key_with_arguments.phpt" role="test" />
	- <file md5sum="bb6596d9586ad78b20cdcac842791c52" name="tests/amqpexchange_var_dump.phpt" role="test" />
	- <file md5sum="4a0a5a690b1f784d85bd040302575a3d" name="tests/amqpqueue_bind_basic.phpt" role="test" />
	- <file md5sum="da143124281d829386f617269ec93fcf" name="tests/amqpqueue_bind_basic_empty_routing_key.phpt" role="test" />
	- <file md5sum="de63dbee4f05ec49ce48ec198b843f4b" name="tests/amqpqueue_bind_basic_headers_arguments.phpt" role="test" />
	- <file md5sum="9b39051f8ef3472bb23b9748da28314d" name="tests/amqpqueue_cancel.phpt" role="test" />
	- <file md5sum="2fc0d97c30d609f40b7c85f529d3f752" name="tests/amqpqueue_construct_basic.phpt" role="test" />
	- <file md5sum="f5a98750453e50334b0aba98efa0b048" name="tests/amqpqueue_consume_basic.phpt" role="test" />
	- <file md5sum="e772e975f5b3d44935e6bb7766ad88e1" name="tests/amqpqueue_consume_multiple.phpt" role="test" />
	- <file md5sum="3cfe9025a23532d552f23fc54d2826d8" name="tests/amqpqueue_consume_nonexistent.phpt" role="test" />
	- <file md5sum="036b629ee10295b0807c73719f22c27f" name="tests/amqpqueue_consume_timeout.phpt" role="test" />
	- <file md5sum="52fff1bf831ded585e3f8819504204b8" name="tests/amqpqueue_declare_basic.phpt" role="test" />
	- <file md5sum="589544992486dc8be9060c3a9ed0c531" name="tests/amqpqueue_delete_basic.phpt" role="test" />
	- <file md5sum="5f559bb943f89d6d2b7f5ab1a85dc42b" name="tests/amqpqueue_empty_name.phpt" role="test" />
	- <file md5sum="23bd785da99b207b13f77d098e4c3f54" name="tests/amqpqueue_get_basic.phpt" role="test" />
	- <file md5sum="6cce48f3831c2d78e92ef263097386d9" name="tests/amqpqueue_get_channel.phpt" role="test" />
	- <file md5sum="5d764f35a9635bd532e9af55f6e63f41" name="tests/amqpqueue_get_connection.phpt" role="test" />
	- <file md5sum="3148d357f550c22bd83ec5339ca63133" name="tests/amqpqueue_get_empty_body.phpt" role="test" />
	- <file md5sum="b29f533327baac398ea760643d3f057f" name="tests/amqpqueue_get_headers.phpt" role="test" />
	- <file md5sum="a591a624eb357a0ef50fc71f0465974d" name="tests/amqpqueue_get_nonexistent.phpt" role="test" />
	- <file md5sum="0f586fa4ee026cef30cf5d330af1133e" name="tests/amqpqueue_nack.phpt" role="test" />
	- <file md5sum="c61d7596374c94b3adc4fab185d00c80" name="tests/amqpqueue_nested_arrays.phpt" role="test" />
	- <file md5sum="3015b1c0f6984bb934dd02748cae6514" name="tests/amqpqueue_nested_headers.phpt" role="test" />
	- <file md5sum="abaf080a5feab914919e8bcf837e9d83" name="tests/amqpqueue_purge_basic.phpt" role="test" />
	- <file md5sum="cc8d6bd67a59536e3a92a3550016e82e" name="tests/amqpqueue_unbind_basic_empty_routing_key.phpt" role="test" />
	- <file md5sum="49ab1e6c77ed9331b5371c04faf95653" name="tests/amqpqueue_unbind_basic_headers_arguments.phpt" role="test" />
	- <file md5sum="186881024eaa17a83a1d93aba3ca5942" name="tests/amqpqueue_var_dump.phpt" role="test" />
	- <file md5sum="efbcc35b58c7b65064660ca65fb1f8da" name="tests/bug_17831.phpt" role="test" />
	- <file md5sum="d85e785d26e265b242b94af5ed2fa046" name="tests/bug_19707.phpt" role="test" />
	- <file md5sum="aac2b2dbbea1bef2322ac549e416ca38" name="tests/bug_19840.phpt" role="test" />
	- <file md5sum="b734fa81a4bb70550ef447ec2dadb5a4" name="tests/bug_61533.phpt" role="test" />
	- <file md5sum="70c4b1222072be9591ff0f2d6bd4a0c9" name="tests/bug_62354.phpt" role="test" />
	- <file md5sum="764b70058dc0694eb7060c50f9bda611" name="tests/bug_gh50-1.phpt" role="test" />
	- <file md5sum="61c947c8bcc32226f09c845f1ca69734" name="tests/bug_gh50-2.phpt" role="test" />
	- <file md5sum="555901187984375d0eda9fd2aa5fb9ed" name="tests/bug_gh50-3.phpt" role="test" />
	- <file md5sum="c791ab105f32830962f2961745dc433e" name="tests/bug_gh50-4.phpt" role="test" />
	- <file md5sum="b7c71b6b0c0653eafe9f8caa15335975" name="tests/bug_gh53-2.phpt" role="test" />
	- <file md5sum="6dab7744024b4d6258141513c15ed102" name="tests/bug_gh53.phpt" role="test" />
	- <file md5sum="d8de8918a3c73ebdcb4159581ea58b5f" name="tests/bug_gh72-1.phpt" role="test" />
	- <file md5sum="0bed5ba885ea925a6045502569a1e946" name="tests/bug_gh72-2.phpt" role="test" />
	- <file md5sum="4f646dfe852ca88d292c987b4b16a71f" name="tests/bug_gh147.phpt" role="test" />
	- <file md5sum="167ef3d96b27b21a1f41e4124ff732e5" name="tests/package-version.phpt" role="test" />
	- </dir>
	- </contents>
	- <dependencies>
	- <required>
	- <php>
	- <min>5.2.0</min>
	- </php>
	- <pearinstaller>
	- <min>1.4.0</min>
	- </pearinstaller>
	- </required>
	- </dependencies>
	- <providesextension>amqp</providesextension>
	- <extsrcrelease />
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.1.1</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2010-08-19</date>
	+ <notes>
	+Updating extension to work with new rabbitmq-c library
	+ </notes>
	+ </release>
	+ <release>
	+ <version>
	+ <release>0.1.0</release>
	+ <api>0.0.1</api>
	+ </version>
	+ <stability>
	+ <release>beta</release>
	+ <api>beta</api>
	+ </stability>
	+ <date>2010-06-19</date>
	+ <notes>
	+- Initial release
	+ </notes>
	+ </release>
	+ </changelog>
	</package>

File Metadata

Mime Type: text/x-diff
Expires: Sat, May 16, 7:21 AM (21 h, 12 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 64097
Default Alt Text: (689 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions