Page MenuHomePhabricator (Chris)
Files F86174

No OneTemporary
Actions

Size
513 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.9.4/CREDITS b/amqp-1.10.2/CREDITS
similarity index 100%
rename from amqp-1.9.4/CREDITS
rename to amqp-1.10.2/CREDITS
diff --git a/amqp-1.9.4/LICENSE b/amqp-1.10.2/LICENSE
similarity index 100%
rename from amqp-1.9.4/LICENSE
rename to amqp-1.10.2/LICENSE
diff --git a/amqp-1.9.4/amqp.c b/amqp-1.10.2/amqp.c
similarity index 88%
rename from amqp-1.9.4/amqp.c
rename to amqp-1.10.2/amqp.c
index 2ab0dee..d2bb7dc 100644
--- a/amqp-1.9.4/amqp.c
+++ b/amqp-1.10.2/amqp.c
@@ -1,344 +1,348 @@
/*
+----------------------------------------------------------------------+
| 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_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_basic_properties.h"
#include "amqp_connection_resource.h"
#include "amqp_channel.h"
#include "amqp_envelope.h"
#include "amqp_exchange.h"
#include "amqp_queue.h"
#include "amqp_timestamp.h"
#include "amqp_decimal.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_exception_class_entry,
*amqp_connection_exception_class_entry,
*amqp_channel_exception_class_entry,
*amqp_queue_exception_class_entry,
*amqp_exchange_exception_class_entry,
*amqp_envelope_exception_class_entry,
*amqp_value_exception_class_entry;
/* {{{ amqp_functions[]
*
*Every user visible function must have an entry in amqp_functions[].
*/
zend_function_entry amqp_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */
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_ENTRY("amqp.cacert", DEFAULT_CACERT, PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("amqp.cert", DEFAULT_CERT, PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("amqp.key", DEFAULT_KEY, PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("amqp.verify", DEFAULT_VERIFY, PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("amqp.sasl_method", DEFAULT_SASL_METHOD, PHP_INI_ALL, NULL)
+ 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.rpc_timeout", DEFAULT_RPC_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.prefetch_size", DEFAULT_PREFETCH_SIZE, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.global_prefetch_count", DEFAULT_GLOBAL_PREFETCH_COUNT, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.global_prefetch_size", DEFAULT_GLOBAL_PREFETCH_SIZE, 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_ENTRY("amqp.cacert", DEFAULT_CACERT, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.cert", DEFAULT_CERT, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.key", DEFAULT_KEY, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.verify", DEFAULT_VERIFY, PHP_INI_ALL, NULL)
+ PHP_INI_ENTRY("amqp.sasl_method", DEFAULT_SASL_METHOD, PHP_INI_ALL, NULL)
PHP_INI_END()
ZEND_DECLARE_MODULE_GLOBALS(amqp);
static PHP_GINIT_FUNCTION(amqp) /* {{{ */
{
amqp_globals->error_message = NULL;
amqp_globals->error_code = 0;
} /* }}} */
static 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_basic_properties)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(amqp_envelope)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(amqp_timestamp)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(amqp_decimal)(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, "AMQPEnvelopeException", NULL);
amqp_envelope_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
zend_declare_property_null(amqp_envelope_exception_class_entry, ZEND_STRL("envelope"), ZEND_ACC_PUBLIC TSRMLS_CC);
INIT_CLASS_ENTRY(ce, "AMQPExchangeException", NULL);
amqp_exchange_exception_class_entry = PHP5to7_zend_register_internal_class_ex(&ce, amqp_exception_class_entry);
INIT_CLASS_ENTRY(ce, "AMQPValueException", NULL);
amqp_value_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);
REGISTER_LONG_CONSTANT("AMQP_SASL_METHOD_PLAIN", AMQP_SASL_METHOD_PLAIN, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("AMQP_SASL_METHOD_EXTERNAL", AMQP_SASL_METHOD_EXTERNAL, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
} /* }}} */
static PHP_MSHUTDOWN_FUNCTION(amqp) /* {{{ */
{
UNREGISTER_INI_ENTRIES();
return SUCCESS;
} /* }}} */
static PHP_RSHUTDOWN_FUNCTION(amqp) /* {{{ */
{
if (NULL != PHP_AMQP_G(error_message)) {
efree(PHP_AMQP_G(error_message));
PHP_AMQP_G(error_message) = NULL;
}
PHP_AMQP_G(error_code) = 0;
return SUCCESS;
} /* }}} */
static 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();
} /* }}} */
/* {{{ amqp_module_entry
*/
zend_module_entry amqp_module_entry = {
STANDARD_MODULE_HEADER,
"amqp",
amqp_functions,
PHP_MINIT(amqp),
PHP_MSHUTDOWN(amqp),
NULL,
PHP_RSHUTDOWN(amqp),
PHP_MINFO(amqp),
PHP_AMQP_VERSION,
PHP_MODULE_GLOBALS(amqp),
PHP_GINIT(amqp),
NULL,
NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
#ifdef COMPILE_DL_AMQP
ZEND_GET_MODULE(amqp)
#endif
int php_amqp_error(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *connection_resource, amqp_channel_resource *channel_resource TSRMLS_DC)
{
return php_amqp_error_advanced(reply, message, connection_resource, channel_resource, 1 TSRMLS_CC);
}
int php_amqp_error_advanced(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *connection_resource, amqp_channel_resource *channel_resource, int fail_on_errors TSRMLS_DC)
{
assert(connection_resource != NULL);
PHP_AMQP_G(error_code) = 0;
if (*message != NULL) {
efree(*message);
}
int res = php_amqp_connection_resource_error(reply, message, connection_resource, (amqp_channel_t)(channel_resource ? channel_resource->channel_id : 0) TSRMLS_CC);
switch (res) {
case PHP_AMQP_RESOURCE_RESPONSE_OK:
break;
case PHP_AMQP_RESOURCE_RESPONSE_ERROR:
if (!fail_on_errors) {
break;
}
/* Library or other non-protocol or even protocol related errors may be here. */
/* In most cases it designate some underlying hard errors. Fail fast. */
case PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED:
/* Mark connection resource as closed to prevent sending any further requests */
connection_resource->is_connected = '\0';
/* Close connection with all its channels */
php_amqp_disconnect_force(connection_resource TSRMLS_CC);
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, 1 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;
}
return res;
}
void php_amqp_zend_throw_exception_short(amqp_rpc_reply_t reply, zend_class_entry *exception_ce TSRMLS_DC) {
php_amqp_zend_throw_exception(reply, exception_ce, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
}
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);
}
}
/*
*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.9.4/amqp_basic_properties.c b/amqp-1.10.2/amqp_basic_properties.c
similarity index 99%
rename from amqp-1.9.4/amqp_basic_properties.c
rename to amqp-1.10.2/amqp_basic_properties.c
index 581b3f1..69b813e 100644
--- a/amqp-1.9.4/amqp_basic_properties.c
+++ b/amqp-1.10.2/amqp_basic_properties.c
@@ -1,628 +1,628 @@
/*
+----------------------------------------------------------------------+
| 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"
#include "Zend/zend_interfaces.h"
#include <amqp.h>
#include <amqp_framing.h>
#ifdef PHP_WIN32
# include "win32/unistd.h"
# include "win32/php_stdint.h"
# include "win32/signal.h"
#else
# include <signal.h>
# include <stdint.h>
# include <unistd.h>
#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
#include "amqp_basic_properties.h"
#include "php_amqp.h"
#include "amqp_timestamp.h"
#include "amqp_decimal.h"
zend_class_entry *amqp_basic_properties_class_entry;
#define this_ce amqp_basic_properties_class_entry
void php_amqp_basic_properties_convert_to_zval(amqp_basic_properties_t *props, zval *obj TSRMLS_DC)
{
object_init_ex(obj, this_ce);
php_amqp_basic_properties_extract(props, obj TSRMLS_CC);
}
void php_amqp_basic_properties_set_empty_headers(zval *obj TSRMLS_DC) {
PHP5to7_zval_t headers PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(headers);
PHP5to7_ARRAY_INIT(headers);
zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
PHP5to7_MAYBE_DESTROY(headers);
}
/* {{{ proto AMQPBasicProperties::__construct() */
static PHP_METHOD(AMQPBasicProperties, __construct) {
char *content_type = NULL; PHP5to7_param_str_len_type_t content_type_len = 0;
char *content_encoding = NULL; PHP5to7_param_str_len_type_t content_encoding_len = 0;
zval *headers = NULL;
PHP5to7_param_long_type_t delivery_mode = AMQP_DELIVERY_NONPERSISTENT;
PHP5to7_param_long_type_t priority = 0;
char *correlation_id = NULL; PHP5to7_param_str_len_type_t correlation_id_len = 0;
char *reply_to = NULL; PHP5to7_param_str_len_type_t reply_to_len = 0;
char *expiration = NULL; PHP5to7_param_str_len_type_t expiration_len = 0;
char *message_id = NULL; PHP5to7_param_str_len_type_t message_id_len = 0;
PHP5to7_param_long_type_t timestamp = 0;
char *type = NULL; PHP5to7_param_str_len_type_t type_len = 0;
char *user_id = NULL; PHP5to7_param_str_len_type_t user_id_len = 0;
char *app_id = NULL; PHP5to7_param_str_len_type_t app_id_len = 0;
char *cluster_id = NULL; PHP5to7_param_str_len_type_t cluster_id_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssallsssslssss",
/* s */ &content_type, &content_type_len,
/* s */ &content_encoding, &content_encoding_len,
/* a */ &headers,
/* l */ &delivery_mode,
/* l */ &priority,
/* s */ &correlation_id, &correlation_id_len,
/* s */ &reply_to, &reply_to_len,
/* s */ &expiration, &expiration_len,
/* s */ &message_id, &message_id_len,
/* l */ &timestamp,
/* s */ &type, &type_len,
/* s */ &user_id, &user_id_len,
/* s */ &app_id, &app_id_len,
/* s */ &cluster_id, &cluster_id_len
) == FAILURE) {
return;
}
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_type"), content_type, content_type_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("content_encoding"), content_encoding, content_encoding_len TSRMLS_CC);
if (headers != NULL) {
zend_update_property(this_ce, getThis(), ZEND_STRL("headers"), headers TSRMLS_CC);
} else {
php_amqp_basic_properties_set_empty_headers(getThis() TSRMLS_CC);
}
zend_update_property_long(this_ce, getThis(), ZEND_STRL("delivery_mode"), delivery_mode TSRMLS_CC);
zend_update_property_long(this_ce, getThis(), ZEND_STRL("priority"), priority TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("correlation_id"), correlation_id, correlation_id_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("reply_to"), reply_to, reply_to_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("expiration"), expiration, expiration_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("message_id"), message_id, message_id_len TSRMLS_CC);
zend_update_property_long(this_ce, getThis(), ZEND_STRL("timestamp"), timestamp TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("type"), type, type_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("user_id"), user_id, user_id_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("app_id"), app_id, app_id_len TSRMLS_CC);
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cluster_id"), cluster_id, cluster_id_len TSRMLS_CC);
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getContentType() */
static PHP_METHOD(AMQPBasicProperties, getContentType) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("content_type");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getContentEncoding() */
static PHP_METHOD(AMQPBasicProperties, getContentEncoding) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("content_encoding");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getCorrelationId() */
static PHP_METHOD(AMQPBasicProperties, getHeaders) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("headers");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getDeliveryMode() */
static PHP_METHOD(AMQPBasicProperties, getDeliveryMode) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("delivery_mode");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getPriority() */
static PHP_METHOD(AMQPBasicProperties, getPriority) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("priority");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getCorrelationId() */
static PHP_METHOD(AMQPBasicProperties, getCorrelationId) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("correlation_id");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getReplyTo() */
static PHP_METHOD(AMQPBasicProperties, getReplyTo) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("reply_to");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getExpiration()
check amqp envelope */
static PHP_METHOD(AMQPBasicProperties, getExpiration) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("expiration");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getMessageId() */
static PHP_METHOD(AMQPBasicProperties, getMessageId) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("message_id");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getTimestamp() */
static PHP_METHOD(AMQPBasicProperties, getTimestamp) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("timestamp");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getType() */
static PHP_METHOD(AMQPBasicProperties, getType) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("type");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getUserId() */
static PHP_METHOD(AMQPBasicProperties, getUserId) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("user_id");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getAppId() */
static PHP_METHOD(AMQPBasicProperties, getAppId) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("app_id");
}
/* }}} */
/* {{{ proto AMQPBasicProperties::getClusterId() */
static PHP_METHOD(AMQPBasicProperties, getClusterId) {
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("cluster_id");
}
/* }}} */
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class__construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getContentType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getContentEncoding, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getHeaders, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getDeliveryMode, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getPriority, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getCorrelationId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getReplyTo, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getExpiration, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getMessageId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getTimestamp, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getType, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getUserId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getAppId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_basic_properties_class_getClusterId, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
zend_function_entry amqp_basic_properties_class_functions[] = {
PHP_ME(AMQPBasicProperties, __construct, arginfo_amqp_basic_properties_class__construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
PHP_ME(AMQPBasicProperties, getContentType, arginfo_amqp_basic_properties_class_getContentType, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getContentEncoding, arginfo_amqp_basic_properties_class_getContentEncoding, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getHeaders, arginfo_amqp_basic_properties_class_getHeaders, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getDeliveryMode, arginfo_amqp_basic_properties_class_getDeliveryMode, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getPriority, arginfo_amqp_basic_properties_class_getPriority, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getCorrelationId, arginfo_amqp_basic_properties_class_getCorrelationId, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getReplyTo, arginfo_amqp_basic_properties_class_getReplyTo, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getExpiration, arginfo_amqp_basic_properties_class_getExpiration, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getMessageId, arginfo_amqp_basic_properties_class_getMessageId, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getTimestamp, arginfo_amqp_basic_properties_class_getTimestamp, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getType, arginfo_amqp_basic_properties_class_getType, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getUserId, arginfo_amqp_basic_properties_class_getUserId, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getAppId, arginfo_amqp_basic_properties_class_getAppId, ZEND_ACC_PUBLIC)
PHP_ME(AMQPBasicProperties, getClusterId, arginfo_amqp_basic_properties_class_getClusterId, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
PHP_MINIT_FUNCTION (amqp_basic_properties) {
zend_class_entry ce;
INIT_CLASS_ENTRY(ce, "AMQPBasicProperties", amqp_basic_properties_class_functions);
this_ce = zend_register_internal_class(&ce TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("content_type"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("content_encoding"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("headers"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_long(this_ce, ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_long(this_ce, ZEND_STRL("priority"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("correlation_id"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("reply_to"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("expiration"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("message_id"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_long(this_ce, ZEND_STRL("timestamp"), 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("type"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("user_id"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("app_id"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_stringl(this_ce, ZEND_STRL("cluster_id"), "", 0, ZEND_ACC_PRIVATE TSRMLS_CC);
return SUCCESS;
}
void parse_amqp_table(amqp_table_t *table, zval *result TSRMLS_DC) {
int i;
zend_bool has_value = 0;
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);
has_value = 1;
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:
if (entry->value.value.u64 > LONG_MAX) {
ZVAL_DOUBLE(PHP5to7_MAYBE_PTR(value), entry->value.value.u64);
} else {
ZVAL_LONG(PHP5to7_MAYBE_PTR(value), entry->value.value.u64);
}
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
+ (unsigned) 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) TSRMLS_CC
);
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) TSRMLS_CC);
break;
case AMQP_FIELD_KIND_TIMESTAMP: {
char timestamp_str[20];
PHP5to7_zval_t timestamp PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(timestamp);
int length = snprintf(timestamp_str, sizeof(timestamp_str), ZEND_ULONG_FMT, entry->value.value.u64);
PHP5to7_ZVAL_STRINGL_DUP(PHP5to7_MAYBE_PTR(timestamp), (char *)timestamp_str, length);
object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_timestamp_class_entry);
zend_call_method_with_1_params(
&value,
amqp_timestamp_class_entry,
NULL,
"__construct",
NULL,
PHP5to7_MAYBE_PTR(timestamp)
);
PHP5to7_MAYBE_DESTROY(timestamp);
break;
}
case AMQP_FIELD_KIND_VOID:
ZVAL_NULL(PHP5to7_MAYBE_PTR(value));
break;
case AMQP_FIELD_KIND_DECIMAL: {
PHP5to7_zval_t e PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_zval_t n PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(e);
PHP5to7_MAYBE_INIT(n);
ZVAL_LONG(PHP5to7_MAYBE_PTR(e), entry->value.value.decimal.decimals);
ZVAL_LONG(PHP5to7_MAYBE_PTR(n), entry->value.value.decimal.value);
object_init_ex(PHP5to7_MAYBE_PTR(value), amqp_decimal_class_entry);
zend_call_method_with_2_params(
&value,
amqp_decimal_class_entry,
NULL,
"__construct",
NULL,
PHP5to7_MAYBE_PTR(e),
PHP5to7_MAYBE_PTR(n)
);
PHP5to7_MAYBE_DESTROY(e);
PHP5to7_MAYBE_DESTROY(n);
break;
}
default:
has_value = 0;
break;
}
if (has_value) {
- char *key = estrndup(entry->key.bytes, (uint) entry->key.len);
+ char *key = estrndup(entry->key.bytes, (unsigned) entry->key.len);
add_assoc_zval(result, key, PHP5to7_MAYBE_PTR(value));
efree(key);
} else {
PHP5to7_MAYBE_DESTROY(value);
}
}
return;
}
void php_amqp_basic_properties_extract(amqp_basic_properties_t *p, zval *obj TSRMLS_DC)
{
PHP5to7_zval_t headers PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(headers);
PHP5to7_ARRAY_INIT(headers);
if (p->_flags & AMQP_BASIC_CONTENT_TYPE_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("content_type"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_CONTENT_ENCODING_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("content_encoding"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_HEADERS_FLAG) {
parse_amqp_table(&(p->headers), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
}
zend_update_property(this_ce, obj, ZEND_STRL("headers"), PHP5to7_MAYBE_PTR(headers) TSRMLS_CC);
if (p->_flags & AMQP_BASIC_DELIVERY_MODE_FLAG) {
zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), (PHP5to7_param_long_type_t) p->delivery_mode TSRMLS_CC);
} else {
/* BC */
zend_update_property_long(this_ce, obj, ZEND_STRL("delivery_mode"), AMQP_DELIVERY_NONPERSISTENT TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_PRIORITY_FLAG) {
zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), (PHP5to7_param_long_type_t) p->priority TSRMLS_CC);
} else {
/* BC */
zend_update_property_long(this_ce, obj, ZEND_STRL("priority"), 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_CORRELATION_ID_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("correlation_id"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_REPLY_TO_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("reply_to"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_EXPIRATION_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("expiration"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_MESSAGE_ID_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("message_id"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_TIMESTAMP_FLAG) {
zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), (PHP5to7_param_long_type_t) p->timestamp TSRMLS_CC);
} else {
/* BC */
zend_update_property_long(this_ce, obj, ZEND_STRL("timestamp"), 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_TYPE_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("type"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_USER_ID_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("user_id"), "", 0 TSRMLS_CC);
}
if (p->_flags & AMQP_BASIC_APP_ID_FLAG) {
zend_update_property_stringl(this_ce, obj, 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, obj, ZEND_STRL("app_id"), "", 0 TSRMLS_CC);
}
PHP5to7_MAYBE_DESTROY(headers);
}
/*
*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.9.4/amqp_basic_properties.h b/amqp-1.10.2/amqp_basic_properties.h
similarity index 100%
rename from amqp-1.9.4/amqp_basic_properties.h
rename to amqp-1.10.2/amqp_basic_properties.h
diff --git a/amqp-1.9.4/amqp_channel.c b/amqp-1.10.2/amqp_channel.c
similarity index 78%
rename from amqp-1.9.4/amqp_channel.c
rename to amqp-1.10.2/amqp_channel.c
index 032526e..ef9552a 100644
--- a/amqp-1.9.4/amqp_channel.c
+++ b/amqp-1.10.2/amqp_channel.c
@@ -1,1238 +1,1483 @@
/*
+----------------------------------------------------------------------+
| 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 <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_methods_handling.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, zend_bool check_errors 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 && channel_resource->channel_id > 0) {
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 (check_errors && PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
return;
}
php_amqp_maybe_release_buffers_on_channel(connection_resource, channel_resource);
}
}
#if PHP_MAJOR_VERSION >= 7
static void php_amqp_destroy_fci(zend_fcall_info *fci) {
if (fci->size > 0) {
zval_ptr_dtor(&fci->function_name);
if (fci->object != NULL) {
#if PHP_VERSION_ID >= 70300
GC_DELREF(fci->object);
#else
GC_REFCOUNT(fci->object)--;
#endif
}
fci->size = 0;
}
}
static void php_amqp_duplicate_fci(zend_fcall_info *source) {
if (source->size > 0) {
zval_add_ref(&source->function_name);
if (source->object != NULL) {
#if PHP_VERSION_ID >= 70300
GC_ADDREF(source->object);
#else
GC_REFCOUNT(source->object)++;
#endif
}
}
}
static int php_amqp_get_fci_gc_data_count(zend_fcall_info *fci) {
int cnt = 0;
if (fci->size > 0) {
cnt ++;
if (fci->object != NULL) {
cnt++;
}
}
return cnt;
}
static zval * php_amqp_get_fci_gc_data(zend_fcall_info *fci, zval *gc_data) {
if (ZEND_FCI_INITIALIZED(*fci)) {
ZVAL_COPY_VALUE(gc_data++, &fci->function_name);
if (fci->object != NULL) {
ZVAL_OBJ(gc_data++, fci->object);
}
}
return gc_data;
}
static HashTable *amqp_channel_gc(zval *object, zval **table, int *n) /* {{{ */
{
amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object);
int basic_return_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_return.fci);
int basic_ack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_ack.fci);
int basic_nack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_nack.fci);
int cnt = basic_return_cnt + basic_ack_cnt + basic_nack_cnt;
if (cnt > channel->gc_data_count) {
channel->gc_data_count = cnt;
channel->gc_data = (zval *) erealloc(channel->gc_data, sizeof(zval) * cnt);
}
zval *gc_data = channel->gc_data;
gc_data = php_amqp_get_fci_gc_data(&channel->callbacks.basic_return.fci, gc_data);
gc_data = php_amqp_get_fci_gc_data(&channel->callbacks.basic_ack.fci, gc_data);
php_amqp_get_fci_gc_data(&channel->callbacks.basic_nack.fci, gc_data);
*table = channel->gc_data;
*n = cnt;
return zend_std_get_properties(object TSRMLS_CC);
} /* }}} */
#else
static void php_amqp_destroy_fci(zend_fcall_info *fci) {
if (fci->size > 0) {
zval_ptr_dtor(&fci->function_name);
if (fci->object_ptr != NULL) {
zval_ptr_dtor(&fci->object_ptr);
}
fci->size = 0;
}
}
static void php_amqp_duplicate_fci(zend_fcall_info *source) {
if (source->size > 0) {
zval_add_ref(&source->function_name);
if (source->object_ptr != NULL) {
zval_add_ref(&source->object_ptr);
}
}
}
static int php_amqp_get_fci_gc_data_count(zend_fcall_info *fci) {
int cnt = 0;
if (fci->size > 0) {
cnt ++;
if (fci->object_ptr != NULL) {
cnt++;
}
}
return cnt;
}
static int php_amqp_get_fci_gc_data(zend_fcall_info *fci, zval **gc_data, int offset) {
if (ZEND_FCI_INITIALIZED(*fci)) {
gc_data[offset++] = fci->function_name;
if (fci->object_ptr != NULL) {
gc_data[offset++] = fci->object_ptr;
}
}
return offset;
}
static HashTable *amqp_channel_gc(zval *object, zval ***table, int *n TSRMLS_DC) /* {{{ */
{
amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(object);
int basic_return_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_return.fci);
int basic_ack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_ack.fci);
int basic_nack_cnt = php_amqp_get_fci_gc_data_count(&channel->callbacks.basic_nack.fci);
int cnt = basic_return_cnt + basic_ack_cnt + basic_nack_cnt;
if (cnt > channel->gc_data_count) {
channel->gc_data_count = cnt;
channel->gc_data = (zval **) erealloc(channel->gc_data, sizeof(zval *) * channel->gc_data_count);
}
php_amqp_get_fci_gc_data(&channel->callbacks.basic_return.fci, channel->gc_data, 0);
php_amqp_get_fci_gc_data(&channel->callbacks.basic_ack.fci, channel->gc_data, basic_return_cnt);
php_amqp_get_fci_gc_data(&channel->callbacks.basic_nack.fci, channel->gc_data, basic_return_cnt + basic_ack_cnt);
*table = channel->gc_data;
*n = cnt;
return zend_std_get_properties(object TSRMLS_CC);
} /* }}} */
#endif
static void php_amqp_clean_callbacks(amqp_channel_callbacks *callbacks) {
php_amqp_destroy_fci(&callbacks->basic_return.fci);
php_amqp_destroy_fci(&callbacks->basic_ack.fci);
php_amqp_destroy_fci(&callbacks->basic_nack.fci);
}
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, 0 TSRMLS_CC);
efree(channel->channel_resource);
channel->channel_resource = NULL;
}
if (channel->gc_data) {
efree(channel->gc_data);
}
php_amqp_clean_callbacks(&channel->callbacks);
zend_object_std_dtor(&channel->zo TSRMLS_CC);
#if PHP_MAJOR_VERSION < 7
if (channel->this_ptr) {
channel->this_ptr = NULL;
}
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)
*/
static 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();
}
PHP5to7_zval_t consumers PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(consumers);
PHP5to7_ARRAY_INIT(consumers);
zend_update_property(this_ce, getThis(), ZEND_STRL("consumers"), PHP5to7_MAYBE_PTR(consumers) TSRMLS_CC);
PHP5to7_MAYBE_DESTROY(consumers);
channel = PHP_AMQP_GET_CHANNEL(getThis());
#if PHP_MAJOR_VERSION < 7
channel->this_ptr = getThis();
#endif
/* Set the prefetch count */
zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_count"), INI_INT("amqp.prefetch_count") TSRMLS_CC);
+ /* Set the prefetch size */
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("prefetch_size"), INI_INT("amqp.prefetch_size") TSRMLS_CC);
+
+ /* Set the global prefetch count */
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), INI_INT("amqp.global_prefetch_count") TSRMLS_CC);
+
+ /* Set the global prefetch size */
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), INI_INT("amqp.global_prefetch_size") 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;
channel_resource->parent = channel;
/* 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
/* Prevent double free, it may happens in case case channel resource was already freed due to some hard error. */
if (channel_resource->connection_resource) {
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+
+ uint16_t global_prefetch_size = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_size");
+ uint16_t global_prefetch_count = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_count");
+
+ /* Set the global prefetch settings (ignoring if 0 for backwards compatibility) */
+ if (global_prefetch_size != 0 || global_prefetch_count != 0) {
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ global_prefetch_size,
+ global_prefetch_count,
+ 1
+ );
+
+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
+
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ return;
+ }
+
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ }
}
/* }}} */
/* {{{ proto bool amqp::isConnected()
check amqp channel */
static 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 AMQPChannel::close()
Close amqp channel */
static PHP_METHOD(amqp_channel_class, close)
{
amqp_channel_resource *channel_resource;
PHP_AMQP_NOPARAMS();
channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
if(channel_resource && channel_resource->is_connected) {
php_amqp_close_channel(channel_resource, 1 TSRMLS_CC);
}
}
/* }}} */
/* {{{ proto bool amqp::getChannelId()
get amqp channel ID */
static 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 */
static PHP_METHOD(amqp_channel_class, setPrefetchCount)
{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+
amqp_channel_resource *channel_resource;
PHP5to7_param_long_type_t prefetch_count;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+
+ uint16_t global_prefetch_size = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_size");
+ uint16_t global_prefetch_count = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_count");
+
+ /* Re-apply current global prefetch settings if set (writing consumer prefetch settings will clear global prefetch settings) */
+ if (global_prefetch_size != 0 || global_prefetch_count != 0) {
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ global_prefetch_size,
+ global_prefetch_count,
+ 1
+ );
+
+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
+
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ 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()
+/* {{{ proto long amqp::getPrefetchCount()
get the number of prefetches */
static 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 */
static PHP_METHOD(amqp_channel_class, setPrefetchSize)
{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+
amqp_channel_resource *channel_resource;
PHP5to7_param_long_type_t prefetch_size;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+
+ uint16_t global_prefetch_size = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_size");
+ uint16_t global_prefetch_count = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_count");
+
+ /* Re-apply current global prefetch settings if set (writing consumer prefetch settings will clear global prefetch settings) */
+ if (global_prefetch_size != 0 || global_prefetch_count != 0) {
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ global_prefetch_size,
+ global_prefetch_count,
+ 1
+ );
+
+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
+
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ 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 */
static PHP_METHOD(amqp_channel_class, getPrefetchSize)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("prefetch_size")
}
/* }}} */
+/* {{{ proto bool amqp::setGlobalPrefetchCount(long count)
+set the number of prefetches */
+static PHP_METHOD(amqp_channel_class, setGlobalPrefetchCount)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+
+ amqp_channel_resource *channel_resource;
+ PHP5to7_param_long_type_t global_prefetch_count;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &global_prefetch_count) == FAILURE) {
+ return;
+ }
+
+ channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(getThis());
+ PHP_AMQP_VERIFY_CHANNEL_CONNECTION_RESOURCE(channel_resource, "Could not set global prefetch count.");
+
+ /* If we are already connected, set the new prefetch count */
+ if (channel_resource->is_connected) {
+ /* Applying global prefetch settings retains existing consumer prefetch settings */
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ 0,
+ (uint16_t)global_prefetch_count,
+ 1
+ );
+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
-/* {{{ proto amqp::qos(long size, long count)
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ return;
+ }
+
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ }
+
+ /* Set the global prefetch count - the implication is to disable the size */
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), global_prefetch_count TSRMLS_CC);
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), 0 TSRMLS_CC);
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto long amqp::getGlobalPrefetchCount()
+get the number of prefetches */
+static PHP_METHOD(amqp_channel_class, getGlobalPrefetchCount)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+ PHP_AMQP_NOPARAMS();
+ PHP_AMQP_RETURN_THIS_PROP("global_prefetch_count")
+}
+/* }}} */
+
+/* {{{ proto bool amqp::setGlobalPrefetchSize(long size)
+set the number of prefetches */
+static PHP_METHOD(amqp_channel_class, setGlobalPrefetchSize)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+
+ amqp_channel_resource *channel_resource;
+ PHP5to7_param_long_type_t global_prefetch_size;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &global_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) {
+ /* Applying global prefetch settings retains existing consumer prefetch settings */
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ (uint16_t)global_prefetch_size,
+ 0,
+ 1
+ );
+
+ amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
+
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ return;
+ }
+
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ }
+
+ /* Set the global prefetch size - the implication is to disable the count */
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), 0 TSRMLS_CC);
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), global_prefetch_size TSRMLS_CC);
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto long amqp::getGlobalPrefetchSize()
+get the number of prefetches */
+static PHP_METHOD(amqp_channel_class, getGlobalPrefetchSize)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+ PHP_AMQP_NOPARAMS();
+ PHP_AMQP_RETURN_THIS_PROP("global_prefetch_size")
+}
+/* }}} */
+
+/* {{{ proto amqp::qos(long size, long count, bool global)
set the number of prefetches */
static 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;
+ zend_bool global = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll", &prefetch_size, &prefetch_count) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll|b", &prefetch_size, &prefetch_count, &global) == 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);
+ /* Set the prefetch size and prefetch count */
+ if (global) {
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_size"), prefetch_size TSRMLS_CC);
+ zend_update_property_long(this_ce, getThis(), ZEND_STRL("global_prefetch_count"), prefetch_count TSRMLS_CC);
+ } else {
+ 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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+
+ uint16_t global_prefetch_size = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_size");
+ uint16_t global_prefetch_count = (uint16_t)PHP_AMQP_READ_THIS_PROP_LONG("global_prefetch_count");
+
+ /* Re-apply current global prefetch settings if set (writing consumer prefetch settings will clear global prefetch settings) */
+ if (global_prefetch_size != 0 || global_prefetch_count != 0) {
+ amqp_basic_qos(
+ channel_resource->connection_resource->connection_state,
+ channel_resource->channel_id,
+ global_prefetch_size,
+ global_prefetch_count,
+ 1
+ );
+
+ res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
+
+ if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
+ php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
+ php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
+ 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 */
static PHP_METHOD(amqp_channel_class, startTransaction)
{
amqp_channel_resource *channel_resource;
amqp_rpc_reply_t res;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 */
static PHP_METHOD(amqp_channel_class, commitTransaction)
{
amqp_channel_resource *channel_resource;
amqp_rpc_reply_t res;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 */
static PHP_METHOD(amqp_channel_class, rollbackTransaction)
{
amqp_channel_resource *channel_resource;
amqp_rpc_reply_t res;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 */
static 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 */
static PHP_METHOD(amqp_channel_class, basicRecover)
{
amqp_channel_resource *channel_resource;
amqp_rpc_reply_t res;
zend_bool requeue = 1;
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto bool amqp::confirmSelect()
Redeliver unacknowledged messages */
PHP_METHOD(amqp_channel_class, confirmSelect)
{
amqp_channel_resource *channel_resource;
amqp_rpc_reply_t res;
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 enable confirms mode.");
amqp_confirm_select(
channel_resource->connection_resource->connection_state,
channel_resource->channel_id
);
res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_channel_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto bool AMQPChannel::setReturnCallback(callable return_callback)
Set callback for basic.return server method handling */
PHP_METHOD(amqp_channel_class, setReturnCallback)
{
zend_fcall_info fci = empty_fcall_info;
zend_fcall_info_cache fcc = empty_fcall_info_cache;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f!", &fci, &fcc) == FAILURE) {
return;
}
amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(getThis());
php_amqp_destroy_fci(&channel->callbacks.basic_return.fci);
if (ZEND_FCI_INITIALIZED(fci)) {
php_amqp_duplicate_fci(&fci);
channel->callbacks.basic_return.fci = fci;
channel->callbacks.basic_return.fcc = fcc;
}
}
/* }}} */
/* {{{ proto bool AMQPChannel::waitForBasicReturn([double timeout=0.0])
Wait for basic.return method from server */
PHP_METHOD(amqp_channel_class, waitForBasicReturn)
{
amqp_channel_object *channel;
amqp_channel_resource *channel_resource;
amqp_method_t method;
int status;
double timeout = 0;
struct timeval tv = {0};
struct timeval *tv_ptr = &tv;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout) == FAILURE) {
return;
}
if (timeout < 0) {
zend_throw_exception(amqp_channel_exception_class_entry, "Timeout must be greater than or equal to zero.", 0 TSRMLS_CC);
return;
}
channel = PHP_AMQP_GET_CHANNEL(getThis());
channel_resource = channel->channel_resource;
PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not start wait loop for basic.return method.");
if (timeout > 0) {
tv.tv_sec = (long int) timeout;
tv.tv_usec = (long int) ((timeout - tv.tv_sec) * 1000000);
} else {
tv_ptr = NULL;
}
assert(channel_resource->channel_id > 0);
while(1) {
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
status = amqp_simple_wait_method_noblock(channel_resource->connection_resource->connection_state, channel_resource->channel_id, AMQP_BASIC_RETURN_METHOD, &method, tv_ptr);
if (AMQP_STATUS_TIMEOUT == status) {
zend_throw_exception(amqp_queue_exception_class_entry, "Wait timeout exceed", 0 TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
if (status != AMQP_STATUS_OK) {
/* Emulate library error */
amqp_rpc_reply_t res;
if (AMQP_RESPONSE_SERVER_EXCEPTION == status) {
res.reply_type = AMQP_RESPONSE_SERVER_EXCEPTION;
res.reply = method;
} else {
res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
res.library_error = status;
}
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
status = php_amqp_handle_basic_return(&PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource->channel_id, channel, &method TSRMLS_CC);
if (PHP_AMQP_RESOURCE_RESPONSE_BREAK == status) {
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
break;
}
if (PHP_AMQP_RESOURCE_RESPONSE_OK != status) {
/* Emulate library error */
amqp_rpc_reply_t res;
res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
res.library_error = status;
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
}
}
/* }}} */
/* {{{ proto bool AMQPChannel::setConfirmCallback(callable ack_callback [, callable nack_callback = null])
Set callback for basic.ack and, optionally, basic.nac server methods handling */
PHP_METHOD(amqp_channel_class, setConfirmCallback)
{
zend_fcall_info ack_fci = empty_fcall_info;
zend_fcall_info_cache ack_fcc = empty_fcall_info_cache;
zend_fcall_info nack_fci = empty_fcall_info;
zend_fcall_info_cache nack_fcc = empty_fcall_info_cache;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f!|f!", &ack_fci, &ack_fcc, &nack_fci, &nack_fcc) == FAILURE) {
return;
}
amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(getThis());
php_amqp_destroy_fci(&channel->callbacks.basic_ack.fci);
if (ZEND_FCI_INITIALIZED(ack_fci)) {
php_amqp_duplicate_fci(&ack_fci);
channel->callbacks.basic_ack.fci = ack_fci;
channel->callbacks.basic_ack.fcc = ack_fcc;
}
php_amqp_destroy_fci(&channel->callbacks.basic_nack.fci);
if (ZEND_FCI_INITIALIZED(nack_fci)) {
php_amqp_duplicate_fci(&nack_fci);
channel->callbacks.basic_nack.fci = nack_fci;
channel->callbacks.basic_nack.fcc = nack_fcc;
}
}
/* }}} */
/* {{{ proto bool amqp::waitForConfirm([double timeout=0.0])
Redeliver unacknowledged messages */
PHP_METHOD(amqp_channel_class, waitForConfirm)
{
amqp_channel_object *channel;
amqp_channel_resource *channel_resource;
amqp_method_t method;
int status;
double timeout = 0;
struct timeval tv = {0};
struct timeval *tv_ptr = &tv;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout) == FAILURE) {
return;
}
if (timeout < 0) {
zend_throw_exception(amqp_channel_exception_class_entry, "Timeout must be greater than or equal to zero.", 0 TSRMLS_CC);
return;
}
channel = PHP_AMQP_GET_CHANNEL(getThis());
channel_resource = channel->channel_resource;
PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not start wait loop for basic.return method.");
if (timeout > 0) {
tv.tv_sec = (long int) timeout;
tv.tv_usec = (long int) ((timeout - tv.tv_sec) * 1000000);
} else {
tv_ptr = NULL;
}
assert(channel_resource->channel_id > 0);
amqp_method_number_t expected_methods[] = { AMQP_BASIC_ACK_METHOD, AMQP_BASIC_NACK_METHOD, AMQP_BASIC_RETURN_METHOD, 0 };
while(1) {
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
status = amqp_simple_wait_method_list_noblock(channel_resource->connection_resource->connection_state, channel_resource->channel_id, expected_methods, &method, tv_ptr);
if (AMQP_STATUS_TIMEOUT == status) {
zend_throw_exception(amqp_queue_exception_class_entry, "Wait timeout exceed", 0 TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
if (status != AMQP_STATUS_OK) {
/* Emulate library error */
amqp_rpc_reply_t res;
if (AMQP_RESPONSE_SERVER_EXCEPTION == status) {
res.reply_type = AMQP_RESPONSE_SERVER_EXCEPTION;
res.reply = method;
} else {
res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
res.library_error = status;
}
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_channel_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
switch(method.id) {
case AMQP_BASIC_ACK_METHOD:
status = php_amqp_handle_basic_ack(&PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource->channel_id, channel, &method TSRMLS_CC);
break;
case AMQP_BASIC_NACK_METHOD:
status = php_amqp_handle_basic_nack(&PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource->channel_id, channel, &method TSRMLS_CC);
break;
case AMQP_BASIC_RETURN_METHOD:
status = php_amqp_handle_basic_return(&PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource->channel_id, channel, &method TSRMLS_CC);
break;
default:
status = AMQP_STATUS_WRONG_METHOD;
}
if (PHP_AMQP_RESOURCE_RESPONSE_BREAK == status) {
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
break;
}
if (PHP_AMQP_RESOURCE_RESPONSE_OK != status) {
/* Emulate library error */
amqp_rpc_reply_t res;
res.reply_type = AMQP_RESPONSE_LIBRARY_EXCEPTION;
res.library_error = status;
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
}
}
/* }}} */
/* {{{ proto amqp::getConsumers() */
static PHP_METHOD(amqp_channel_class, getConsumers)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("consumers");
}
/* }}} */
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_close, 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_setGlobalPrefetchSize, 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_getGlobalPrefetchSize, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setGlobalPrefetchCount, 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_getGlobalPrefetchCount, 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_ARG_INFO(0, global)
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_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_confirmSelect, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setConfirmCallback, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, ack_callback)
ZEND_ARG_INFO(0, nack_callback)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_waitForConfirm, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_setReturnCallback, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, return_callback)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_waitForBasicReturn, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_ARG_INFO(0, timeout)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_channel_class_getConsumers, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
//setConfirmsCallback
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, close, arginfo_amqp_channel_class_close, 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, 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, setGlobalPrefetchSize, arginfo_amqp_channel_class_setGlobalPrefetchSize, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_channel_class, getGlobalPrefetchSize, arginfo_amqp_channel_class_getGlobalPrefetchSize, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_channel_class, setGlobalPrefetchCount, arginfo_amqp_channel_class_setGlobalPrefetchCount, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_channel_class, getGlobalPrefetchCount, arginfo_amqp_channel_class_getGlobalPrefetchCount, 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)
PHP_ME(amqp_channel_class, confirmSelect, arginfo_amqp_channel_class_confirmSelect, ZEND_ACC_PUBLIC)
PHP_ME(amqp_channel_class, waitForConfirm, arginfo_amqp_channel_class_waitForConfirm, ZEND_ACC_PUBLIC)
PHP_ME(amqp_channel_class, setConfirmCallback, arginfo_amqp_channel_class_setConfirmCallback, ZEND_ACC_PUBLIC)
PHP_ME(amqp_channel_class, setReturnCallback, arginfo_amqp_channel_class_setReturnCallback, ZEND_ACC_PUBLIC)
PHP_ME(amqp_channel_class, waitForBasicReturn, arginfo_amqp_channel_class_waitForBasicReturn, ZEND_ACC_PUBLIC)
PHP_ME(amqp_channel_class, getConsumers, arginfo_amqp_channel_class_getConsumers, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
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);
+ zend_declare_property_null(this_ce, ZEND_STRL("global_prefetch_count"), ZEND_ACC_PRIVATE TSRMLS_CC);
+ zend_declare_property_null(this_ce, ZEND_STRL("global_prefetch_size"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("consumers"), 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_channel_object, zo);
amqp_channel_object_handlers.free_obj = amqp_channel_free;
#endif
#if ZEND_MODULE_API_NO >= 20100000
amqp_channel_object_handlers.get_gc = amqp_channel_gc;
#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.9.4/amqp_channel.h b/amqp-1.10.2/amqp_channel.h
similarity index 100%
rename from amqp-1.9.4/amqp_channel.h
rename to amqp-1.10.2/amqp_channel.h
diff --git a/amqp-1.9.4/amqp_connection.c b/amqp-1.10.2/amqp_connection.c
similarity index 90%
rename from amqp-1.9.4/amqp_connection.c
rename to amqp-1.10.2/amqp_connection.c
index a6bda06..5891a4f 100644
--- a/amqp-1.9.4/amqp_connection.c
+++ b/amqp-1.10.2/amqp_connection.c
@@ -1,1522 +1,1659 @@
/*
+----------------------------------------------------------------------+
| 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 "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;
#define PHP_AMQP_EXTRACT_CONNECTION_STR(name) \
zdata = NULL; \
if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), (name), sizeof(name), zdata)) { \
+ SEPARATE_ZVAL(zdata); \
convert_to_string(PHP5to7_MAYBE_DEREF(zdata)); \
} \
if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) { \
zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
} else { \
zend_update_property_string(this_ce, getThis(), ZEND_STRL(name), INI_STR("amqp." name) TSRMLS_CC); \
}
#define PHP_AMQP_EXTRACT_CONNECTION_BOOL(name) \
zdata = NULL; \
if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), (name), sizeof(name), zdata)) { \
+ SEPARATE_ZVAL(zdata); \
convert_to_long(PHP5to7_MAYBE_DEREF(zdata)); \
} \
if (zdata) { \
zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC); \
} else { \
zend_update_property_bool(this_ce, getThis(), ZEND_STRL(name), INI_INT("amqp." name) TSRMLS_CC); \
}
static int php_amqp_connection_resource_deleter(PHP5to7_zend_resource_le_t *el, amqp_connection_resource *connection_resource TSRMLS_DC)
{
if (Z_RES_P(el)->ptr == connection_resource) {
return ZEND_HASH_APPLY_REMOVE | ZEND_HASH_APPLY_STOP;
}
return ZEND_HASH_APPLY_KEEP;
}
static PHP5to7_param_str_len_type_t php_amqp_get_connection_hash(amqp_connection_params *params, char **hash) {
return spprintf(hash,
0,
- "amqp_conn_res_h:%s_p:%d_v:%s_l:%s_p:%s_f:%d_c:%d_h:%d_cacert:%s_cert:%s_key:%s_sasl_method:%d",
+ "amqp_conn_res_h:%s_p:%d_v:%s_l:%s_p:%s_f:%d_c:%d_h:%d_cacert:%s_cert:%s_key:%s_sasl_method:%d_connection_name:%s",
params->host,
params->port,
params->vhost,
params->login,
params->password,
params->frame_max,
params->channel_max,
params->heartbeat,
params->cacert,
params->cert,
params->key,
- params->sasl_method
+ params->sasl_method,
+ params->connection_name
);
}
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->connection_resource = NULL;
connection_resource->parent = NULL;
if (connection_resource->is_dirty) {
if (connection_resource->is_persistent) {
zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t)php_amqp_connection_resource_deleter, (void*)connection_resource TSRMLS_CC);
}
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);
}
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 = NULL;
PHP5to7_param_str_len_type_t key_len = 0;
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);
}
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 = PHP_AMQP_READ_THIS_PROP_DOUBLE("read_timeout");
connection_params.write_timeout = PHP_AMQP_READ_THIS_PROP_DOUBLE("write_timeout");
connection_params.connect_timeout = PHP_AMQP_READ_THIS_PROP_DOUBLE("connect_timeout");
+ connection_params.rpc_timeout = PHP_AMQP_READ_THIS_PROP_DOUBLE("rpc_timeout");
connection_params.cacert = PHP_AMQP_READ_THIS_PROP_STRLEN("cacert") ? PHP_AMQP_READ_THIS_PROP_STR("cacert") : NULL;
connection_params.cert = PHP_AMQP_READ_THIS_PROP_STRLEN("cert") ? PHP_AMQP_READ_THIS_PROP_STR("cert") : NULL;
connection_params.key = PHP_AMQP_READ_THIS_PROP_STRLEN("key") ? PHP_AMQP_READ_THIS_PROP_STR("key") : NULL;
connection_params.verify = (int) PHP_AMQP_READ_THIS_PROP_BOOL("verify");
connection_params.sasl_method = (int) PHP_AMQP_READ_THIS_PROP_LONG("sasl_method");
+ connection_params.connection_name = PHP_AMQP_READ_THIS_PROP_STRLEN("connection_name") ? PHP_AMQP_READ_THIS_PROP_STR("connection_name") : NULL;
if (persistent) {
PHP5to7_zend_resource_store_t *le = PHP5to7_ZEND_RESOURCE_EMPTY;
/* Look for an established resource */
key_len = php_amqp_get_connection_hash(&connection_params, &key);
if (PHP5to7_ZEND_HASH_STR_FIND_PTR(&EG(persistent_list), key, key_len, 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_set_resource_write_timeout(connection->connection_resource, PHP_AMQP_READ_THIS_PROP_DOUBLE("write_timeout") TSRMLS_CC) == 0
+ || php_amqp_set_resource_rpc_timeout(connection->connection_resource, PHP_AMQP_READ_THIS_PROP_DOUBLE("rpc_timeout") TSRMLS_CC) == 0) {
php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
- return 0;
+ 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 = php_amqp_get_connection_hash(&connection_params, &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), key, key_len, new_le, sizeof(PHP5to7_zend_resource_store_t))) {
efree(key);
php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
return 0;
}
efree(key);
}
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);
}
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
+ * The array can contain 'host', 'port', 'login', 'password', 'vhost', 'read_timeout', 'write_timeout', 'connect_timeout', 'rpc_timeout' and 'timeout' (deprecated) indexes
*/
static 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) {
+ 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
+ SEPARATE_ZVAL(zdata);
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)) {
+ SEPARATE_ZVAL(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.password"))) 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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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");
+ SEPARATE_ZVAL(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 '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)) {
+ SEPARATE_ZVAL(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("rpc_timeout"), INI_FLT("amqp.rpc_timeout") TSRMLS_CC);
+
+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "rpc_timeout", sizeof("rpc_timeout"), zdata)) {
+ SEPARATE_ZVAL(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 'rpc_timeout' must be greater than or equal to zero.", 0 TSRMLS_CC);
+ } else {
+ zend_update_property_double(this_ce, getThis(), ZEND_STRL("rpc_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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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)) {
+ SEPARATE_ZVAL(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);
}
}
zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), INI_INT("amqp.sasl_method") TSRMLS_CC);
if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "sasl_method", sizeof("sasl_method"), zdata)) {
+ SEPARATE_ZVAL(zdata);
convert_to_long(PHP5to7_MAYBE_DEREF(zdata));
zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), Z_LVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
}
PHP_AMQP_EXTRACT_CONNECTION_STR("cacert");
PHP_AMQP_EXTRACT_CONNECTION_STR("key");
PHP_AMQP_EXTRACT_CONNECTION_STR("cert");
PHP_AMQP_EXTRACT_CONNECTION_BOOL("verify");
+
+ /* Pull the connection_name out of the $params array */
+ zdata = NULL;
+ if (ini_arr && PHP5to7_ZEND_HASH_FIND(HASH_OF(ini_arr), "connection_name", sizeof("connection_name"), zdata)) {
+ SEPARATE_ZVAL(zdata);
+ convert_to_string(PHP5to7_MAYBE_DEREF(zdata));
+ }
+ if (zdata && Z_STRLEN_P(PHP5to7_MAYBE_DEREF(zdata)) > 0) {
+ zend_update_property_string(this_ce, getThis(), ZEND_STRL("connection_name"), Z_STRVAL_P(PHP5to7_MAYBE_DEREF(zdata)) TSRMLS_CC);
+ }
}
/* }}} */
/* {{{ proto amqp::isConnected()
check amqp connection */
static 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 */
static 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 */
static 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 */
static 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);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::disconnect()
destroy amqp connection */
static 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);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::reconnect()
recreate amqp connection */
static 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);
}
RETURN_BOOL(php_amqp_connect(connection, 0, INTERNAL_FUNCTION_PARAM_PASSTHRU));
}
/* }}} */
/* {{{ proto amqp::preconnect()
recreate amqp connection */
static 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);
}
RETURN_BOOL(php_amqp_connect(connection, 1, INTERNAL_FUNCTION_PARAM_PASSTHRU));
}
/* }}} */
/* {{{ proto amqp::getLogin()
get the login */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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) {
+ 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("port"), port TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getVhost()
get the vhost */
static 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 */
static PHP_METHOD(amqp_connection_class, setVhost)
{
char *vhost = NULL; PHP5to7_param_str_len_type_t vhost_len = 0;
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 */
static 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 */
static 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);
RETURN_FALSE;
}
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getReadTimeout()
get the read timeout */
static 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 */
static 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);
RETURN_FALSE;
}
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getWriteTimeout()
get write timeout */
static 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 */
static 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);
RETURN_FALSE;
}
}
RETURN_TRUE;
}
/* }}} */
+/* {{{ proto amqp::getRpcTimeout()
+get rpc timeout */
+static PHP_METHOD(amqp_connection_class, getRpcTimeout)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+ PHP_AMQP_NOPARAMS();
+ PHP_AMQP_RETURN_THIS_PROP("rpc_timeout");
+}
+/* }}} */
+
+/* {{{ proto amqp::setRpcTimeout(double timeout)
+set rpc timeout */
+static PHP_METHOD(amqp_connection_class, setRpcTimeout)
+{
+ amqp_connection_object *connection;
+ double rpc_timeout;
+
+ /* Get the timeout from the method params */
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &rpc_timeout) == FAILURE) {
+ return;
+ }
+
+ /* Validate timeout */
+ if (rpc_timeout < 0) {
+ zend_throw_exception(amqp_connection_exception_class_entry, "Parameter 'rpc_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("rpc_timeout"), rpc_timeout TSRMLS_CC);
+
+ if (connection->connection_resource && connection->connection_resource->is_connected) {
+ if (php_amqp_set_resource_rpc_timeout(connection->connection_resource, rpc_timeout TSRMLS_CC) == 0) {
+
+ php_amqp_disconnect_force(connection->connection_resource TSRMLS_CC);
+
+ RETURN_FALSE;
+ }
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
/* {{{ proto amqp::getUsedChannels()
Get max used channels number */
static 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)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
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_LONG(connection->connection_resource->max_slots);
}
PHP_AMQP_RETURN_THIS_PROP("channel_max");
}
/* }}} */
/* {{{ proto amqp::getMaxFrameSize()
Get max supported frame size per connection in bytes */
static PHP_METHOD(amqp_connection_class, getMaxFrameSize)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
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_LONG(amqp_get_frame_max(connection->connection_resource->connection_state));
}
PHP_AMQP_RETURN_THIS_PROP("frame_max");
}
/* }}} */
/* {{{ proto amqp::getHeartbeatInterval()
Get number of seconds between heartbeats of the connection in seconds */
static PHP_METHOD(amqp_connection_class, getHeartbeatInterval)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
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 != NULL
&& connection->connection_resource->is_connected != '\0') {
RETURN_LONG(amqp_get_heartbeat(connection->connection_resource->connection_state));
}
PHP_AMQP_RETURN_THIS_PROP("heartbeat");
}
/* }}} */
/* {{{ proto amqp::isPersistent()
check whether amqp connection is persistent */
static 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);
}
/* }}} */
/* {{{ proto amqp::getCACert() */
static PHP_METHOD(amqp_connection_class, getCACert)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("cacert");
}
/* }}} */
/* {{{ proto amqp::setCACert(string cacert) */
static PHP_METHOD(amqp_connection_class, setCACert)
{
char *str = NULL; PHP5to7_param_str_len_type_t str_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
return;
}
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cacert"), str, str_len TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getCert() */
static PHP_METHOD(amqp_connection_class, getCert)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("cert");
}
/* }}} */
/* {{{ proto amqp::setCert(string cert) */
static PHP_METHOD(amqp_connection_class, setCert)
{
char *str = NULL; PHP5to7_param_str_len_type_t str_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
return;
}
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("cert"), str, str_len TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getKey() */
static PHP_METHOD(amqp_connection_class, getKey)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("key");
}
/* }}} */
/* {{{ proto amqp::setKey(string key) */
static PHP_METHOD(amqp_connection_class, setKey)
{
char *str = NULL; PHP5to7_param_str_len_type_t str_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
return;
}
zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("key"), str, str_len TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getVerify() */
static PHP_METHOD(amqp_connection_class, getVerify)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("verify");
}
/* }}} */
/* {{{ proto amqp::setVerify(bool verify) */
static PHP_METHOD(amqp_connection_class, setVerify)
{
zend_bool verify = 1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &verify) == FAILURE) {
return;
}
zend_update_property_bool(this_ce, getThis(), ZEND_STRL("verify"), verify TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto amqp::getSaslMethod()
get sasl method */
static PHP_METHOD(amqp_connection_class, getSaslMethod)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP_AMQP_NOPARAMS();
PHP_AMQP_RETURN_THIS_PROP("sasl_method");
}
/* }}} */
/* {{{ proto amqp::setSaslMethod(mixed method)
set sasl method */
static PHP_METHOD(amqp_connection_class, setSaslMethod)
{
long method;
/* Get the port from the method params */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method) == FAILURE) {
return;
}
/* Check the method value */
if (method != AMQP_SASL_METHOD_PLAIN && method != AMQP_SASL_METHOD_EXTERNAL) {
zend_throw_exception(amqp_connection_exception_class_entry, "Invalid SASL method given. Method must be AMQP_SASL_METHOD_PLAIN or AMQP_SASL_METHOD_EXTERNAL.", 0 TSRMLS_CC);
return;
}
zend_update_property_long(this_ce, getThis(), ZEND_STRL("sasl_method"), method TSRMLS_CC);
RETURN_TRUE;
}
/* }}} */
+/* {{{ proto amqp::getConnectionName() */
+static PHP_METHOD(amqp_connection_class, getConnectionName)
+{
+ PHP5to7_READ_PROP_RV_PARAM_DECL;
+ PHP_AMQP_NOPARAMS();
+ PHP_AMQP_RETURN_THIS_PROP("connection_name");
+}
+/* }}} */
+
+/* {{{ proto amqp::setConnectionName(string connectionName) */
+static PHP_METHOD(amqp_connection_class, setConnectionName)
+{
+ char *str = NULL; PHP5to7_param_str_len_type_t str_len = 0;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &str, &str_len) == FAILURE) {
+ return;
+ }
+ if (str == NULL) {
+ zend_update_property_null(this_ce, getThis(), ZEND_STRL("connection_name") TSRMLS_CC);
+ } else {
+ zend_update_property_stringl(this_ce, getThis(), ZEND_STRL("connection_name"), str, str_len TSRMLS_CC);
+ }
+
+
+ RETURN_TRUE;
+}
+/* }}} */
+
/* 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_getRpcTimeout, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setRpcTimeout, 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()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getCACert, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setCACert, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, cacert)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getCert, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setCert, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, cert)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getKey, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setKey, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, key)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getVerify, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setVerify, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, verify)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getSaslMethod, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setSaslMethod, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, sasl_method)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_getConnectionName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_amqp_connection_class_setConnectionName, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
+ ZEND_ARG_INFO(0, connection_name)
+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, getRpcTimeout, arginfo_amqp_connection_class_getRpcTimeout, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_connection_class, setRpcTimeout, arginfo_amqp_connection_class_setRpcTimeout, 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)
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)
PHP_ME(amqp_connection_class, getCACert, arginfo_amqp_connection_class_getCACert, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, setCACert, arginfo_amqp_connection_class_setCACert, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, getCert, arginfo_amqp_connection_class_getCert, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, setCert, arginfo_amqp_connection_class_setCert, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, getKey, arginfo_amqp_connection_class_getKey, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, setKey, arginfo_amqp_connection_class_setKey, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, getVerify, arginfo_amqp_connection_class_getVerify, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, setVerify, arginfo_amqp_connection_class_setVerify, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, getSaslMethod, arginfo_amqp_connection_class_getSaslMethod, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, setSaslMethod, arginfo_amqp_connection_class_setSaslMethod, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_connection_class, getConnectionName, arginfo_amqp_connection_class_getConnectionName, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_connection_class, setConnectionName, arginfo_amqp_connection_class_setConnectionName, ZEND_ACC_PUBLIC)
+
{NULL, NULL, NULL}
};
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("rpc_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);
zend_declare_property_null(this_ce, ZEND_STRL("cacert"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("key"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("cert"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("verify"), ZEND_ACC_PRIVATE TSRMLS_CC);
zend_declare_property_null(this_ce, ZEND_STRL("sasl_method"), ZEND_ACC_PRIVATE TSRMLS_CC);
+ zend_declare_property_null(this_ce, ZEND_STRL("connection_name"), 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.9.4/amqp_connection.h b/amqp-1.10.2/amqp_connection.h
similarity index 100%
rename from amqp-1.9.4/amqp_connection.h
rename to amqp-1.10.2/amqp_connection.h
diff --git a/amqp-1.9.4/amqp_connection_resource.c b/amqp-1.10.2/amqp_connection_resource.c
similarity index 94%
rename from amqp-1.9.4/amqp_connection_resource.c
rename to amqp-1.10.2/amqp_connection_resource.c
index 8e3c624..7e20a5c 100644
--- a/amqp-1.9.4/amqp_connection_resource.c
+++ b/amqp-1.10.2/amqp_connection_resource.c
@@ -1,646 +1,679 @@
/*
+----------------------------------------------------------------------+
| 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 "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_tcp_socket.h>
#include <amqp_framing.h>
#include <amqp_ssl_socket.h>
#ifdef PHP_WIN32
# include "win32/unistd.h"
#else
# include <unistd.h>
#endif
//#include "amqp_basic_properties.h"
#include "amqp_methods_handling.h"
#include "amqp_connection_resource.h"
#include "amqp_channel.h"
#include "php_amqp.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);
static void php_amqp_close_connection_from_server(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource TSRMLS_DC);
static void php_amqp_close_channel_from_server(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource, amqp_channel_t channel_id 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: {
php_amqp_close_connection_from_server(reply, message, resource TSRMLS_CC);
return PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED;
}
case AMQP_CHANNEL_CLOSE_METHOD: {
php_amqp_close_channel_from_server(reply, message, resource, channel_id TSRMLS_CC);
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*/
}
static void php_amqp_close_connection_from_server(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource TSRMLS_DC) {
amqp_connection_close_t *m = (amqp_connection_close_t *)reply.reply.decoded;
int result;
if (!reply.reply.id) {
PHP_AMQP_G(error_code) = -1;
spprintf(message, 0, "Server connection error: %d, message: %s",
PHP_AMQP_G(error_code),
"unexpected response"
);
} else {
PHP_AMQP_G(error_code) = m->reply_code;
spprintf(message, 0, "Server connection error: %d, message: %.*s",
m->reply_code,
(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;
result = amqp_send_method(
resource->connection_state,
0, /* NOTE: 0-channel is reserved for things like this */
AMQP_CONNECTION_CLOSE_OK_METHOD,
&decoded
);
if (result != AMQP_STATUS_OK) {
zend_throw_exception(amqp_channel_exception_class_entry, "An error occurred while closing the connection.", 0 TSRMLS_CC);
}
/* Prevent finishing AMQP connection in connection resource destructor */
resource->is_connected = '\0';
}
static void php_amqp_close_channel_from_server(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource, amqp_channel_t channel_id TSRMLS_DC) {
assert(channel_id > 0 && channel_id <= resource->max_slots);
amqp_channel_close_t *m = (amqp_channel_close_t *) reply.reply.decoded;
if (!reply.reply.id) {
PHP_AMQP_G(error_code) = -1;
spprintf(message, 0, "Server channel error: %d, message: %s",
PHP_AMQP_G(error_code),
"unexpected response"
);
} else {
PHP_AMQP_G(error_code) = m->reply_code;
spprintf(message, 0, "Server channel error: %d, message: %.*s",
m->reply_code,
(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.
*/
if (resource) {
int result;
amqp_channel_close_ok_t *decoded = (amqp_channel_close_ok_t *) NULL;
result = amqp_send_method(
resource->connection_state,
channel_id,
AMQP_CHANNEL_CLOSE_OK_METHOD,
&decoded
);
if (result != AMQP_STATUS_OK) {
zend_throw_exception(amqp_channel_exception_class_entry, "An error occurred while closing channel.", 0 TSRMLS_CC);
}
}
}
int php_amqp_connection_resource_error_advanced(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource, amqp_channel_t channel_id, amqp_channel_object *channel TSRMLS_DC)
{
assert(resource != NULL);
amqp_frame_t frame;
assert(AMQP_RESPONSE_LIBRARY_EXCEPTION == reply.reply_type);
assert(AMQP_STATUS_UNEXPECTED_STATE == reply.library_error);
if (channel_id < 0 || AMQP_STATUS_OK != amqp_simple_wait_frame(resource->connection_state, &frame)) {
if (*message != NULL) {
efree(*message);
}
spprintf(message, 0, "Library error: %s", amqp_error_string2(reply.library_error));
return PHP_AMQP_RESOURCE_RESPONSE_ERROR;
}
if (channel_id != frame.channel) {
spprintf(message, 0, "Library error: channel mismatch");
return PHP_AMQP_RESOURCE_RESPONSE_ERROR;
}
if (AMQP_FRAME_METHOD == frame.frame_type) {
switch (frame.payload.method.id) {
case AMQP_CONNECTION_CLOSE_METHOD: {
php_amqp_close_connection_from_server(reply, message, resource TSRMLS_CC);
return PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED;
}
case AMQP_CHANNEL_CLOSE_METHOD: {
php_amqp_close_channel_from_server(reply, message, resource, channel_id TSRMLS_CC);
return PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED;
}
case AMQP_BASIC_ACK_METHOD:
/* if we've turned publisher confirms on, and we've published a message
* here is a message being confirmed
*/
return php_amqp_handle_basic_ack(message, resource, channel_id, channel, &frame.payload.method TSRMLS_CC);
case AMQP_BASIC_NACK_METHOD:
/* if we've turned publisher confirms on, and we've published a message
* here is a message being confirmed
*/
return php_amqp_handle_basic_nack(message, resource, channel_id, channel, &frame.payload.method TSRMLS_CC);
case AMQP_BASIC_RETURN_METHOD:
/* if a published message couldn't be routed and the mandatory flag was set
* this is what would be returned. The message then needs to be read.
*/
return php_amqp_handle_basic_return(message, resource, channel_id, channel, &frame.payload.method TSRMLS_CC);
default:
if (*message != NULL) {
efree(*message);
}
spprintf(message, 0, "Library error: An unexpected method was received 0x%08X\n", frame.payload.method.id);
return PHP_AMQP_RESOURCE_RESPONSE_ERROR;
}
}
if (*message != NULL) {
efree(*message);
}
spprintf(message, 0, "Library error: %s", amqp_error_string2(reply.library_error));
return PHP_AMQP_RESOURCE_RESPONSE_ERROR;
}
/* 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(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_rpc_timeout(amqp_connection_resource *resource, double timeout TSRMLS_DC)
+{
+ assert(timeout >= 0.0);
+
+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH >= 90
+ struct timeval rpc_timeout;
+
+ if (timeout == 0.) return 1;
+
+ rpc_timeout.tv_sec = (int) floor(timeout);
+ rpc_timeout.tv_usec = (int) ((timeout - floor(timeout)) * 1.e+6);
+
+ if (AMQP_STATUS_OK != amqp_set_rpc_timeout(resource->connection_state, &rpc_timeout)) {
+ zend_throw_exception(amqp_connection_exception_class_entry, "Library error: cannot set rpc_timeout", 0 TSRMLS_CC);
+ return 0;
+ }
+#endif
+
+ 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_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;
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_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_entry_t custom_properties_entries[2];
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);
/* Create the connection */
resource->connection_state = amqp_new_connection();
/* Create socket object */
if (params->cacert) {
resource->socket = amqp_ssl_socket_new(resource->connection_state);
if (!resource->socket) {
zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: could not create SSL socket.", 0 TSRMLS_CC);
return NULL;
}
} else {
resource->socket = amqp_tcp_socket_new(resource->connection_state);
if (!resource->socket) {
zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: could not create socket.", 0 TSRMLS_CC);
return NULL;
}
}
if (params->cacert && amqp_ssl_socket_set_cacert(resource->socket, params->cacert)) {
zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: could not set CA certificate.", 0 TSRMLS_CC);
return NULL;
}
if (params->cacert) {
#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH >= 80
amqp_ssl_socket_set_verify_peer(resource->socket, params->verify);
amqp_ssl_socket_set_verify_hostname(resource->socket, params->verify);
#else
amqp_ssl_socket_set_verify(resource->socket, params->verify);
#endif
}
if (params->cert && params->key && amqp_ssl_socket_set_key(resource->socket, params->cert, params->key)) {
zend_throw_exception(amqp_connection_exception_class_entry, "Socket error: could not setting client cert.", 0 TSRMLS_CC);
return NULL;
}
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, 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, params->read_timeout TSRMLS_CC)) {
connection_resource_destructor(resource, persistent TSRMLS_CC);
return NULL;
}
if (!php_amqp_set_resource_write_timeout(resource, params->write_timeout TSRMLS_CC)) {
connection_resource_destructor(resource, persistent TSRMLS_CC);
return NULL;
}
+ if (!php_amqp_set_resource_rpc_timeout(resource, params->rpc_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;
+
+ if (params->connection_name) {
+ custom_properties_entries[1].key = amqp_cstring_bytes("connection_name");
+ custom_properties_entries[1].value.kind = AMQP_FIELD_KIND_UTF8;
+ custom_properties_entries[1].value.value.bytes = amqp_cstring_bytes(params->connection_name);
+ }
+
custom_properties_table.entries = custom_properties_entries;
- custom_properties_table.num_entries = sizeof(custom_properties_entries) / sizeof(amqp_table_entry_t);
+ custom_properties_table.num_entries = params->connection_name ? 2 : 1;
/* We can assume that connection established here but it is not true, real handshake goes during login */
assert(params->frame_max > 0);
amqp_rpc_reply_t res = amqp_login_with_properties(
resource->connection_state,
params->vhost,
params->channel_max,
params->frame_max,
params->heartbeat,
&custom_properties_table,
params->sasl_method,
params->login,
params->password
);
efree(std_datetime);
if (AMQP_RESPONSE_NORMAL != res.reply_type) {
char *message = NULL, *long_message = NULL;
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, PHP_AMQP_G(error_code) 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_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 *)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 *)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);
#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
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], 0 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.9.4/amqp_connection_resource.h b/amqp-1.10.2/amqp_connection_resource.h
similarity index 95%
rename from amqp-1.9.4/amqp_connection_resource.h
rename to amqp-1.10.2/amqp_connection_resource.h
index 2dbe4ab..ee81319 100644
--- a/amqp-1.9.4/amqp_connection_resource.h
+++ b/amqp-1.10.2/amqp_connection_resource.h
@@ -1,85 +1,90 @@
/*
+----------------------------------------------------------------------+
| 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_BREAK 1
#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;
#include "php_amqp.h"
#include "amqp.h"
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;
+ double rpc_timeout;
char *cacert;
char *cert;
char *key;
int verify;
int sasl_method;
+ char *connection_name;
} 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);
int php_amqp_connection_resource_error_advanced(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource, amqp_channel_t channel_id, amqp_channel_object *channel 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);
+/*Not socket-related rpc timeout function */
+int php_amqp_set_resource_rpc_timeout(amqp_connection_resource *resource, double rpc_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_resource *channel_resource, amqp_channel_t channel_id);
/* Creating and destroying resource */
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.9.4/amqp_decimal.c b/amqp-1.10.2/amqp_decimal.c
similarity index 100%
rename from amqp-1.9.4/amqp_decimal.c
rename to amqp-1.10.2/amqp_decimal.c
diff --git a/amqp-1.9.4/amqp_decimal.h b/amqp-1.10.2/amqp_decimal.h
similarity index 100%
rename from amqp-1.9.4/amqp_decimal.h
rename to amqp-1.10.2/amqp_decimal.h
diff --git a/amqp-1.9.4/amqp_envelope.c b/amqp-1.10.2/amqp_envelope.c
similarity index 100%
rename from amqp-1.9.4/amqp_envelope.c
rename to amqp-1.10.2/amqp_envelope.c
diff --git a/amqp-1.9.4/amqp_envelope.h b/amqp-1.10.2/amqp_envelope.h
similarity index 100%
rename from amqp-1.9.4/amqp_envelope.h
rename to amqp-1.10.2/amqp_envelope.h
diff --git a/amqp-1.9.4/amqp_exchange.c b/amqp-1.10.2/amqp_exchange.c
similarity index 99%
rename from amqp-1.9.4/amqp_exchange.c
rename to amqp-1.10.2/amqp_exchange.c
index 42b84b9..4f80d3b 100644
--- a/amqp-1.9.4/amqp_exchange.c
+++ b/amqp-1.10.2/amqp_exchange.c
@@ -1,905 +1,905 @@
/*
+----------------------------------------------------------------------+
| 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>
#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"
#include "amqp_type.h"
zend_class_entry *amqp_exchange_class_entry;
#define this_ce amqp_exchange_class_entry
/* {{{ proto AMQPExchange::__construct(AMQPChannel channel);
create Exchange */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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 */
static 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) */
static 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)) {
+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned)(key_len + 1), tmp)) {
RETURN_FALSE;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto AMQPExchange::getArguments
Get the exchange arguments */
static 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 */
static 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) */
static 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));
+ PHP5to7_ZEND_HASH_DEL(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned) (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 *));
+ PHP5to7_ZEND_HASH_ADD(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned) (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
*/
static 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 = php_amqp_type_convert_zval_to_amqp_table(PHP_AMQP_READ_THIS_PROP("arguments") TSRMLS_CC);
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
);
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
php_amqp_type_free_amqp_table(arguments);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_exchange_exception_class_entry TSRMLS_CC);
return;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto AMQPExchange::delete([string name[, long params]]);
delete Exchange
*/
static 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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_exchange_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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
*/
static 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/",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!la/",
&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 = php_amqp_type_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_type_char_to_amqp_long(msg, msg_len) /* message body */
);
if (headers) {
php_amqp_type_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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_exchange_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto int exchange::bind(string srcExchangeName[, string routingKey, array arguments]);
bind exchange to exchange by routing key
*/
static 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 = php_amqp_type_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_type_free_amqp_table(arguments);
}
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_exchange_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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
*/
static 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 = php_amqp_type_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_type_free_amqp_table(arguments);
}
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_exchange_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 */
static 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 */
static 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}
};
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_stringl(this_ce, ZEND_STRL("name"), "", 0, 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.9.4/amqp_exchange.h b/amqp-1.10.2/amqp_exchange.h
similarity index 100%
rename from amqp-1.9.4/amqp_exchange.h
rename to amqp-1.10.2/amqp_exchange.h
diff --git a/amqp-1.9.4/amqp_methods_handling.c b/amqp-1.10.2/amqp_methods_handling.c
similarity index 100%
rename from amqp-1.9.4/amqp_methods_handling.c
rename to amqp-1.10.2/amqp_methods_handling.c
diff --git a/amqp-1.9.4/amqp_methods_handling.h b/amqp-1.10.2/amqp_methods_handling.h
similarity index 100%
rename from amqp-1.9.4/amqp_methods_handling.h
rename to amqp-1.10.2/amqp_methods_handling.h
diff --git a/amqp-1.9.4/amqp_queue.c b/amqp-1.10.2/amqp_queue.c
similarity index 98%
rename from amqp-1.9.4/amqp_queue.c
rename to amqp-1.10.2/amqp_queue.c
index a60fa20..c13629c 100644
--- a/amqp-1.9.4/amqp_queue.c
+++ b/amqp-1.10.2/amqp_queue.c
@@ -1,1300 +1,1300 @@
/*
+----------------------------------------------------------------------+
| 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>
#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"
#include "amqp_type.h"
zend_class_entry *amqp_queue_class_entry;
#define this_ce amqp_queue_class_entry
/* {{{ proto AMQPQueue::__construct(AMQPChannel channel)
AMQPQueue constructor
*/
static 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 */
static 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 */
static 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);
/* BC */
RETURN_TRUE;
}
/* }}} */
/* {{{ proto AMQPQueue::getFlags()
Get the queue parameters */
static 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 */
static 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 */
static 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)) {
+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned)(key_len + 1), tmp)) {
RETURN_FALSE;
}
RETURN_ZVAL(PHP5to7_MAYBE_DEREF(tmp), 1, 0);
}
/* }}} */
/* {{{ proto AMQPQueue::hasArgument(string key) */
static 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)) {
+ if (!PHP5to7_ZEND_HASH_FIND(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned)(key_len + 1), tmp)) {
RETURN_FALSE;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto AMQPQueue::getArguments
Get the queue arguments */
static 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 */
static 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 */
static 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));
+ PHP5to7_ZEND_HASH_DEL(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned) (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 *));
+ PHP5to7_ZEND_HASH_ADD(PHP_AMQP_READ_THIS_PROP_ARR("arguments"), key, (unsigned) (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
*/
static 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 = php_amqp_type_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_type_free_amqp_table(arguments);
if (!r) {
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
message_count = r->message_count;
/* Set the queue name, in case it is an autogenerated queue name */
name = php_amqp_type_amqp_bytes_to_char(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
*/
static 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",
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!a",
&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 = php_amqp_type_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_type_free_amqp_table(arguments);
}
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_queue_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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)
*/
static 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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_queue_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
if (AMQP_BASIC_GET_EMPTY_METHOD == res.reply.id) {
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_queue_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
amqp_destroy_envelope(&envelope);
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
*/
static PHP_METHOD(amqp_queue_class, consume)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
PHP5to7_zval_t *consumer_tag_zv = NULL;
PHP5to7_zval_t current_channel_zv PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_zval_t *current_queue_zv = NULL;
amqp_channel_resource *channel_resource;
amqp_channel_resource *current_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;
}
zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel");
zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
if (IS_ARRAY != Z_TYPE_P(consumers)) {
zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC);
return;
}
amqp_channel_object *channel = PHP_AMQP_GET_CHANNEL(channel_zv);
channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channel_zv);
PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not get channel.");
if (!(AMQP_JUST_CONSUME & flags)) {
/* Setup the consume */
arguments = php_amqp_type_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_type_free_amqp_table(arguments);
if (!r) {
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
php_amqp_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
zend_throw_exception(amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
char *key;
- key = estrndup((char *) r->consumer_tag.bytes, (uint) r->consumer_tag.len);
+ key = estrndup((char *) r->consumer_tag.bytes, (unsigned) r->consumer_tag.len);
if (PHP5to7_ZEND_HASH_FIND(Z_ARRVAL_P(consumers), (const char *) key, PHP5to7_ZEND_HASH_STRLEN(r->consumer_tag.len), consumer_tag_zv)) {
// This should never happen as AMQP server guarantees that consumer tag is unique within channel
zend_throw_exception(amqp_exception_class_entry, "Duplicate consumer tag", 0 TSRMLS_CC);
efree(key);
return;
}
PHP5to7_zval_t tmp PHP5to7_MAYBE_SET_TO_NULL;
#if PHP_MAJOR_VERSION >= 7
PHP5to7_MAYBE_INIT(tmp);
ZVAL_COPY(PHP5to7_MAYBE_PTR(tmp), getThis());
#else
tmp = getThis();
Z_ADDREF_P(tmp);
#endif
PHP5to7_ZEND_HASH_ADD(Z_ARRVAL_P(consumers),
(const char *) key,
PHP5to7_ZEND_HASH_STRLEN(r->consumer_tag.len),
PHP5to7_MAYBE_PTR(tmp),
sizeof(PHP5to7_MAYBE_PTR_TYPE)
);
efree(key);
/* 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) {
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);
return;
}
if (PHP_AMQP_MAYBE_ERROR_RECOVERABLE(res, channel_resource)) {
if (PHP_AMQP_IS_ERROR_RECOVERABLE(res, channel_resource, channel)) {
/* In case no message was received, continue the loop */
amqp_destroy_envelope(&envelope);
continue;
} else {
/* Mark connection resource as closed to prevent sending any further requests */
channel_resource->connection_resource->is_connected = '\0';
/* Close connection with all its channels */
php_amqp_disconnect_force(channel_resource->connection_resource TSRMLS_CC);
}
php_amqp_zend_throw_exception_short(res, amqp_queue_exception_class_entry TSRMLS_CC);
amqp_destroy_envelope(&envelope);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
PHP5to7_MAYBE_INIT(message);
convert_amqp_envelope_to_zval(&envelope, PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
current_channel_resource = channel_resource->connection_resource->slots[envelope.channel - 1];
if (!current_channel_resource) {
// This should never happen, but just in case
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, "Orphaned channel. Please, report a bug.", 0 TSRMLS_CC);
amqp_destroy_envelope(&envelope);
break;
}
#if PHP_MAJOR_VERSION >= 7
PHP5to7_MAYBE_INIT(current_channel_zv);
ZVAL_OBJ(&current_channel_zv, &current_channel_resource->parent->zo);
#else
current_channel_zv = current_channel_resource->parent->this_ptr;
#endif
consumers = zend_read_property(amqp_channel_class_entry, PHP5to7_MAYBE_PTR(current_channel_zv), ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
if (IS_ARRAY != Z_TYPE_P(consumers)) {
zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC);
amqp_destroy_envelope(&envelope);
break;
}
char *key;
- key = estrndup((char *)envelope.consumer_tag.bytes, (uint) envelope.consumer_tag.len);
+ key = estrndup((char *)envelope.consumer_tag.bytes, (unsigned) envelope.consumer_tag.len);
if (!PHP5to7_ZEND_HASH_FIND(Z_ARRVAL_P(consumers), key, PHP5to7_ZEND_HASH_STRLEN(envelope.consumer_tag.len), current_queue_zv)) {
PHP5to7_zval_t exception PHP5to7_MAYBE_SET_TO_NULL;
PHP5to7_MAYBE_INIT(exception);
object_init_ex(PHP5to7_MAYBE_PTR(exception), amqp_envelope_exception_class_entry);
zend_update_property_string(zend_exception_get_default(TSRMLS_C), PHP5to7_MAYBE_PTR(exception), ZEND_STRL("message"), "Orphaned envelope" TSRMLS_CC);
zend_update_property(amqp_envelope_exception_class_entry, PHP5to7_MAYBE_PTR(exception), ZEND_STRL("envelope"), PHP5to7_MAYBE_PTR(message) TSRMLS_CC);
zend_throw_exception_object(PHP5to7_MAYBE_PTR(exception) TSRMLS_CC);
PHP5to7_MAYBE_DESTROY(message);
amqp_destroy_envelope(&envelope);
efree(key);
break;
}
efree(key);
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, PHP5to7_MAYBE_DEREF(current_queue_zv));
Z_ADDREF_P(PHP5to7_MAYBE_DEREF(current_queue_zv));
/* 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
*/
static 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto int AMQPQueue::nack(long deliveryTag, [bit flags=AMQP_NOPARAM]);
acknowledge the message
*/
static 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto int AMQPQueue::reject(long deliveryTag, [bit flags=AMQP_NOPARAM]);
acknowledge the message
*/
static 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
RETURN_TRUE;
}
/* }}} */
/* {{{ proto int AMQPQueue::purge();
purge queue
*/
static 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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
*/
static PHP_METHOD(amqp_queue_class, cancel)
{
PHP5to7_READ_PROP_RV_PARAM_DECL;
amqp_channel_resource *channel_resource;
PHP5to7_zval_t *tmp = NULL;
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;
}
zval *channel_zv = PHP_AMQP_READ_THIS_PROP("channel");
zval *consumers = zend_read_property(amqp_channel_class_entry, channel_zv, ZEND_STRL("consumers"), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC);
zend_bool has_consumer_tag = (zend_bool) (IS_STRING == Z_TYPE_P(PHP_AMQP_READ_THIS_PROP("consumer_tag")));
if (IS_ARRAY != Z_TYPE_P(consumers)) {
zend_throw_exception(amqp_queue_exception_class_entry, "Invalid channel consumers, forgot to call channel constructor?", 0 TSRMLS_CC);
return;
}
channel_resource = PHP_AMQP_GET_CHANNEL_RESOURCE(channel_zv);
PHP_AMQP_VERIFY_CHANNEL_RESOURCE(channel_resource, "Could not cancel queue.");
if (!consumer_tag_len && (!has_consumer_tag || !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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
return;
}
if (!consumer_tag_len || has_consumer_tag && 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);
}
char *key;
- key = estrndup((char *)r->consumer_tag.bytes, (uint) r->consumer_tag.len);
+ key = estrndup((char *)r->consumer_tag.bytes, (unsigned) r->consumer_tag.len);
PHP5to7_ZEND_HASH_DEL(Z_ARRVAL_P(consumers), (const char *) key, PHP5to7_ZEND_HASH_STRLEN(r->consumer_tag.len));
efree(key);
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
*/
static 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 = php_amqp_type_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_type_free_amqp_table(arguments);
}
amqp_rpc_reply_t res = amqp_get_rpc_reply(channel_resource->connection_resource->connection_state);
if (PHP_AMQP_MAYBE_ERROR(res, channel_resource)) {
php_amqp_zend_throw_exception_short(res, amqp_queue_exception_class_entry TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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
*/
static 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_error(res, &PHP_AMQP_G(error_message), channel_resource->connection_resource, channel_resource TSRMLS_CC);
php_amqp_zend_throw_exception(res, amqp_queue_exception_class_entry, PHP_AMQP_G(error_message), PHP_AMQP_G(error_code) TSRMLS_CC);
php_amqp_maybe_release_buffers_on_channel(channel_resource->connection_resource, channel_resource);
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 */
static 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 */
static 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*/
static 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}
};
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.9.4/amqp_queue.h b/amqp-1.10.2/amqp_queue.h
similarity index 100%
rename from amqp-1.9.4/amqp_queue.h
rename to amqp-1.10.2/amqp_queue.h
diff --git a/amqp-1.9.4/amqp_timestamp.c b/amqp-1.10.2/amqp_timestamp.c
similarity index 100%
rename from amqp-1.9.4/amqp_timestamp.c
rename to amqp-1.10.2/amqp_timestamp.c
diff --git a/amqp-1.9.4/amqp_timestamp.h b/amqp-1.10.2/amqp_timestamp.h
similarity index 100%
rename from amqp-1.9.4/amqp_timestamp.h
rename to amqp-1.10.2/amqp_timestamp.h
diff --git a/amqp-1.9.4/amqp_type.c b/amqp-1.10.2/amqp_type.c
similarity index 98%
rename from amqp-1.9.4/amqp_type.c
rename to amqp-1.10.2/amqp_type.c
index e0bbeda..fb87727 100644
--- a/amqp-1.9.4/amqp_type.c
+++ b/amqp-1.10.2/amqp_type.c
@@ -1,382 +1,382 @@
/*
+----------------------------------------------------------------------+
| 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 |
+----------------------------------------------------------------------+
*/
#include <stdint.h>
#include <amqp.h>
#include "Zend/zend_interfaces.h"
#include "amqp_type.h"
#include "amqp_timestamp.h"
#include "amqp_decimal.h"
#ifdef PHP_WIN32
# define strtoimax _strtoi64
#endif
static void php_amqp_type_internal_free_amqp_array(amqp_array_t *array);
static void php_amqp_type_internal_free_amqp_table(amqp_table_t *object, zend_bool clear_root);
amqp_bytes_t php_amqp_type_char_to_amqp_long(char const *cstr, PHP5to7_param_str_len_type_t len)
{
amqp_bytes_t result;
if (len < 1) {
return amqp_empty_bytes;
}
result.len = (size_t)len;
result.bytes = (void *) cstr;
return result;
}
char *php_amqp_type_amqp_bytes_to_char(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 php_amqp_type_internal_convert_zval_array(zval *php_array, amqp_field_value_t **field, zend_bool 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;
+ unsigned key_len;
- ulong index;
+ zend_ulong index;
ht = Z_ARRVAL_P(php_array);
zend_bool is_amqp_array = 1;
PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, index, real_key, key, key_len, data, value, pos) {
if (PHP5to7_ZEND_HASH_KEY_IS_STRING(ht, real_key, key, key_len, index, pos)) {
is_amqp_array = 0;
break;
}
} PHP5to7_ZEND_HASH_FOREACH_END();
if (is_amqp_array) {
(*field)->kind = AMQP_FIELD_KIND_ARRAY;
php_amqp_type_internal_convert_zval_to_amqp_array(php_array, &(*field)->value.array TSRMLS_CC);
} else {
(*field)->kind = AMQP_FIELD_KIND_TABLE;
php_amqp_type_internal_convert_zval_to_amqp_table(php_array, &(*field)->value.table, allow_int_keys TSRMLS_CC);
}
}
void php_amqp_type_internal_convert_zval_to_amqp_table(zval *php_array, amqp_table_t *amqp_table, zend_bool 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;
+ unsigned key_len;
- ulong index;
+ zend_ulong index;
ht = Z_ARRVAL_P(php_array);
amqp_table->entries = (amqp_table_entry_t *)ecalloc((size_t)zend_hash_num_elements(ht), sizeof(amqp_table_entry_t));
amqp_table->num_entries = 0;
PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, index, real_key, key, key_len, data, value, pos) {
char *string_key;
amqp_table_entry_t *table_entry;
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);
continue;
}
} else {
PHP5to7_ZEND_HASH_KEY_MAYBE_UNPACK(real_key, key, key_len);
}
/* Build the value */
table_entry = &amqp_table->entries[amqp_table->num_entries++];
field = &table_entry->value;
if (!php_amqp_type_internal_convert_php_to_amqp_field_value(value, &field, key TSRMLS_CC)) {
/* Reset entries counter back */
amqp_table->num_entries --;
continue;
}
string_key = estrndup(key, key_len);
table_entry->key = amqp_cstring_bytes(string_key);
} PHP5to7_ZEND_HASH_FOREACH_END();
}
void php_amqp_type_internal_convert_zval_to_amqp_array(zval *zvalArguments, amqp_array_t *arguments TSRMLS_DC)
{
HashTable *ht;
HashPosition pos;
zval *value;
zval **data;
PHP5to7_ZEND_REAL_HASH_KEY_T *real_key;
char *key;
- uint key_len;
+ unsigned key_len;
- ulong index;
+ zend_ulong index;
char type[16];
ht = Z_ARRVAL_P(zvalArguments);
/* Allocate all the memory necessary for storing the arguments */
arguments->entries = (amqp_field_value_t *)ecalloc((size_t)zend_hash_num_elements(ht), sizeof(amqp_field_value_t));
arguments->num_entries = 0;
PHP5to7_ZEND_HASH_FOREACH_KEY_VAL(ht, index, real_key, key, key_len, data, value, pos) {
amqp_field_value_t *field = &arguments->entries[arguments->num_entries++];
if (!php_amqp_type_internal_convert_php_to_amqp_field_value(value, &field, key TSRMLS_CC)) {
/* Reset entries counter back */
arguments->num_entries --;
continue;
}
} PHP5to7_ZEND_HASH_FOREACH_END();
}
zend_bool php_amqp_type_internal_convert_php_to_amqp_field_value(zval *value, amqp_field_value_t **fieldPtr, char *key TSRMLS_DC)
{
zend_bool result;
char type[16];
amqp_field_value_t *field;
result = 1;
field = *fieldPtr;
switch (Z_TYPE_P(value)) {
PHP5to7_CASE_IS_BOOL:
field->kind = AMQP_FIELD_KIND_BOOLEAN;
field->value.boolean = (amqp_boolean_t) !PHP5to7_IS_FALSE_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));
+ bytes.bytes = estrndup(Z_STRVAL_P(value), (unsigned) Z_STRLEN_P(value));
field->value.bytes = bytes;
} else {
field->value.bytes = amqp_empty_bytes;
}
break;
case IS_ARRAY:
php_amqp_type_internal_convert_zval_array(value, &field, 1 TSRMLS_CC);
break;
case IS_NULL:
field->kind = AMQP_FIELD_KIND_VOID;
break;
case IS_OBJECT:
if (instanceof_function(Z_OBJCE_P(value), amqp_timestamp_class_entry TSRMLS_CC)) {
PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL;
zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_timestamp_class_entry, NULL, "gettimestamp", &result_zv);
field->kind = AMQP_FIELD_KIND_TIMESTAMP;
field->value.u64 = strtoimax(Z_STRVAL(PHP5to7_MAYBE_DEREF(result_zv)), NULL, 10);
PHP5to7_MAYBE_DESTROY(result_zv);
break;
} else if (instanceof_function(Z_OBJCE_P(value), amqp_decimal_class_entry TSRMLS_CC)) {
field->kind = AMQP_FIELD_KIND_DECIMAL;
PHP5to7_zval_t result_zv PHP5to7_MAYBE_SET_TO_NULL;
zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getexponent", &result_zv);
field->value.decimal.decimals = (uint8_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv));
PHP5to7_MAYBE_DESTROY(result_zv);
zend_call_method_with_0_params(PHP5to7_MAYBE_PARAM_PTR(value), amqp_decimal_class_entry, NULL, "getsignificand", &result_zv);
field->value.decimal.value = (uint32_t)Z_LVAL(PHP5to7_MAYBE_DEREF(result_zv));
PHP5to7_MAYBE_DESTROY(result_zv);
break;
}
default:
switch(Z_TYPE_P(value)) {
case IS_OBJECT:
strcpy(type, "object");
break;
case IS_RESOURCE:
strcpy(type, "resource");
break;
default:
strcpy(type, "unknown");
break;
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ignoring field '%s' due to unsupported value type (%s)", key, type);
result = 0;
break;
}
return result;
}
amqp_table_t *php_amqp_type_convert_zval_to_amqp_table(zval *php_array TSRMLS_DC)
{
amqp_table_t *amqp_table;
/* In setArguments, we are overwriting all the existing values */
amqp_table = (amqp_table_t *)emalloc(sizeof(amqp_table_t));
php_amqp_type_internal_convert_zval_to_amqp_table(php_array, amqp_table, 0 TSRMLS_CC);
return amqp_table;
}
static void php_amqp_type_internal_free_amqp_array(amqp_array_t *array) {
if (!array) {
return;
}
int macroEntryCounter;
for (macroEntryCounter = 0; macroEntryCounter < array->num_entries; macroEntryCounter++) {
amqp_field_value_t *entry = &array->entries[macroEntryCounter];
switch (entry->kind) {
case AMQP_FIELD_KIND_TABLE:
php_amqp_type_internal_free_amqp_table(&entry->value.table, 0);
break;
case AMQP_FIELD_KIND_ARRAY:
php_amqp_type_internal_free_amqp_array(&entry->value.array);
break;
case AMQP_FIELD_KIND_UTF8:
if (entry->value.bytes.bytes) {
efree(entry->value.bytes.bytes);
}
break;
//
default:
break;
}
}
if (array->entries) {
efree(array->entries);
}
}
static void php_amqp_type_internal_free_amqp_table(amqp_table_t *object, zend_bool 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:
php_amqp_type_internal_free_amqp_table(&entry->value.value.table, 0);
break;
case AMQP_FIELD_KIND_ARRAY:
php_amqp_type_internal_free_amqp_array(&entry->value.value.array);
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_type_free_amqp_table(amqp_table_t *object)
{
php_amqp_type_internal_free_amqp_table(object, 1);
}
diff --git a/amqp-1.9.4/amqp_type.h b/amqp-1.10.2/amqp_type.h
similarity index 100%
rename from amqp-1.9.4/amqp_type.h
rename to amqp-1.10.2/amqp_type.h
diff --git a/amqp-1.9.4/benchmark.php b/amqp-1.10.2/benchmark.php
similarity index 100%
rename from amqp-1.9.4/benchmark.php
rename to amqp-1.10.2/benchmark.php
diff --git a/amqp-1.9.4/config.m4 b/amqp-1.10.2/config.m4
similarity index 94%
rename from amqp-1.9.4/config.m4
rename to amqp-1.10.2/config.m4
index 51c33b6..7756eb1 100644
--- a/amqp-1.9.4/config.m4
+++ b/amqp-1.10.2/config.m4
@@ -1,146 +1,143 @@
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 librabbitmq install prefix.], yes)
if test "$PHP_AMQP" != "no"; then
dnl Write more examples of tests here...
AC_MSG_CHECKING([for supported PHP versions])
PHP_REF_FOUND_VERSION=`${PHP_CONFIG} --version`
PHP_REF_FOUND_VERNUM=`${PHP_CONFIG} --vernum`
if test "$PHP_REF_FOUND_VERNUM" -lt "50600"; then
AC_MSG_ERROR([PHP version not supported, >= 5.6 required, but $PHP_REF_FOUND_VERSION found])
else
AC_MSG_RESULT([supported ($PHP_REF_FOUND_VERSION)])
fi
AC_MSG_RESULT($PHP_AMQP)
dnl # --with-amqp -> check with-path
SEARCH_FOR="amqp_framing.h"
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "$PHP_LIBRABBITMQ_DIR" = "yes" -a -x $PKG_CONFIG; then
AC_MSG_CHECKING([for amqp using pkg-config])
if ! $PKG_CONFIG --exists librabbitmq ; then
AC_MSG_ERROR([librabbitmq not found])
fi
PHP_AMQP_VERSION=`$PKG_CONFIG librabbitmq --modversion`
AC_MSG_RESULT([found version $PHP_AMQP_VERSION])
- if ! $PKG_CONFIG librabbitmq --atleast-version 0.5.2 ; then
- AC_MSG_ERROR([librabbitmq must be version 0.5.2 or greater])
- fi
- if ! $PKG_CONFIG librabbitmq --atleast-version 0.6.0 ; then
- AC_MSG_WARN([librabbitmq 0.6.0 or greater recommended])
+ if ! $PKG_CONFIG librabbitmq --atleast-version 0.7.1 ; then
+ AC_MSG_ERROR([librabbitmq must be version 0.7.1 or greater])
fi
PHP_AMQP_LIBS=`$PKG_CONFIG librabbitmq --libs`
PHP_AMQP_INCS=`$PKG_CONFIG librabbitmq --cflags`
PHP_EVAL_LIBLINE($PHP_AMQP_LIBS, AMQP_SHARED_LIBADD)
PHP_EVAL_INCLINE($PHP_AMQP_INCS)
else
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)
old_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -I$AMQP_DIR/include"
AC_CACHE_CHECK(for librabbitmq version, ac_cv_librabbitmq_version, [
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include "amqp.h"
#include <stdio.h>
int main ()
{
FILE *testfile = fopen("conftestval", "w");
if (NULL == testfile) {
return 1;
}
fprintf(testfile, "%s\n", AMQ_VERSION_STRING);
fclose(testfile);
return 0;
}
]])],[ac_cv_librabbitmq_version=`cat ./conftestval`],[ac_cv_librabbitmq_version=NONE],[ac_cv_librabbitmq_version=NONE])
])
CFLAGS=$old_CFLAGS
if test "$ac_cv_librabbitmq_version" != "NONE"; then
ac_IFS=$IFS
IFS=.
set $ac_cv_librabbitmq_version
IFS=$ac_IFS
LIBRABBITMQ_API_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
if test "$LIBRABBITMQ_API_VERSION" -lt 5001 ; then
AC_MSG_ERROR([librabbitmq must be version 0.5.2 or greater, $ac_cv_librabbitmq_version version given instead])
fi
if test "$LIBRABBITMQ_API_VERSION" -lt 6000 ; then
AC_MSG_WARN([librabbitmq 0.6.0 or greater recommended, current version is $ac_cv_librabbitmq_version])
fi
else
AC_MSG_ERROR([could not determine librabbitmq version])
fi
dnl # --with-amqp -> check for lib and symbol presence
LIBNAME=rabbitmq
LIBSYMBOL=rabbitmq
PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $AMQP_DIR/$PHP_LIBDIR, AMQP_SHARED_LIBADD)
fi
PHP_SUBST(AMQP_SHARED_LIBADD)
AMQP_SOURCES="amqp.c amqp_type.c amqp_exchange.c amqp_queue.c amqp_connection.c amqp_connection_resource.c amqp_channel.c amqp_envelope.c amqp_basic_properties.c amqp_methods_handling.c amqp_timestamp.c amqp_decimal.c"
PHP_NEW_EXTENSION(amqp, $AMQP_SOURCES, $ext_shared)
fi
diff --git a/amqp-1.9.4/config.w32 b/amqp-1.10.2/config.w32
similarity index 100%
rename from amqp-1.9.4/config.w32
rename to amqp-1.10.2/config.w32
diff --git a/amqp-1.9.4/php5_support.h b/amqp-1.10.2/php5_support.h
similarity index 93%
rename from amqp-1.9.4/php5_support.h
rename to amqp-1.10.2/php5_support.h
index 91bd87e..5c57620 100644
--- a/amqp-1.9.4/php5_support.h
+++ b/amqp-1.10.2/php5_support.h
@@ -1,121 +1,121 @@
/*
+----------------------------------------------------------------------+
| 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_PTR_TYPE PHP5to7_zval_t
#define PHP5to7_MAYBE_PARAM_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_MAYBE_DESTROY2(zv, pzv) zval_ptr_dtor(&pzv);
#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_ADD_NEXT_INDEX_STRINGL_DUP(arg, str, length) add_next_index_stringl((arg), (str), (unsigned)(length), 1)
#define PHP5to7_ZEND_HASH_FIND(ht, str, len, res) \
- (zend_hash_find((ht), (str), (uint)(len), (void **) &(res)) != FAILURE)
+ (zend_hash_find((ht), (str), (unsigned)(len), (void **) &(res)) != FAILURE)
-#define PHP5to7_ZEND_HASH_STRLEN(len) (uint)((len) + 1)
-#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_STRLEN(len) (unsigned)((len) + 1)
+#define PHP5to7_ZEND_HASH_DEL(ht, key, len) zend_hash_del_key_or_index((ht), (key), (unsigned)(len), 0, HASH_DEL_KEY);
+#define PHP5to7_ZEND_HASH_ADD(ht, key, len, pData, nDataSize) (zend_hash_add((ht), (key), (unsigned)(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, key, len, res) PHP5to7_ZEND_HASH_FIND((ht), (key), (len), (res))
#define PHP5to7_ZEND_HASH_STR_DEL(ht, key, len) PHP5to7_ZEND_HASH_DEL((ht), (key), (len))
#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_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))
#define PHP5to7_PARENT_CLASS_NAME_C(name) , (name)
#define ZEND_ULONG_FMT "%" PRIu64
#define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL_CLASS
#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.9.4/php7_support.h b/amqp-1.10.2/php7_support.h
similarity index 97%
rename from amqp-1.9.4/php7_support.h
rename to amqp-1.10.2/php7_support.h
index 075994b..47ce983 100644
--- a/amqp-1.9.4/php7_support.h
+++ b/amqp-1.10.2/php7_support.h
@@ -1,113 +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_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_PTR_TYPE PHP5to7_zval_t *
#define PHP5to7_MAYBE_PARAM_PTR(zv) (zv)
#define PHP5to7_MAYBE_INIT(zv) ZVAL_UNDEF(&(zv))
#define PHP5to7_ARRAY_INIT(zv) array_init(&(zv));
#define PHP5to7_MAYBE_DESTROY(zv) if (!Z_ISUNDEF(zv)) { zval_ptr_dtor(&(zv)); }
#define PHP5to7_MAYBE_DESTROY2(zv, pzv) if (!Z_ISUNDEF(zv)) { zval_ptr_dtor(pzv); }
#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_STRLEN(len) (PHP5to7_param_str_len_type_t)((len) + 1)
-#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_DEL(ht, key, len) zend_hash_str_del_ind((ht), (key), (unsigned)(len - 1))
+#define PHP5to7_ZEND_HASH_ADD(ht, key, len, pData, nDataSize) zend_hash_str_add((ht), (key), (unsigned)(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, key, len, res) ((res = zend_hash_str_find_ptr((ht), (key), (size_t)(len))) != NULL)
-#define PHP5to7_ZEND_HASH_STR_DEL(ht, key, len) zend_hash_str_del_ind((ht), (key), (uint)(len))
+#define PHP5to7_ZEND_HASH_STR_DEL(ht, key, len) zend_hash_str_del_ind((ht), (key), (unsigned)(len))
#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(pzv) == 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_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))
#define PHP5to7_PARENT_CLASS_NAME_C(name)
#define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
#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.9.4/php_amqp.h b/amqp-1.10.2/php_amqp.h
similarity index 95%
rename from amqp-1.9.4/php_amqp.h
rename to amqp-1.10.2/php_amqp.h
index 3120142..36a080b 100644
--- a/amqp-1.9.4/php_amqp.h
+++ b/amqp-1.10.2/php_amqp.h
@@ -1,394 +1,398 @@
/*
+----------------------------------------------------------------------+
| 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_H
#define PHP_AMQP_H
/* True global resources - no need for thread safety here */
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,
*amqp_envelope_exception_class_entry,
*amqp_value_exception_class_entry;
typedef struct _amqp_connection_resource amqp_connection_resource;
typedef struct _amqp_connection_object amqp_connection_object;
typedef struct _amqp_channel_object amqp_channel_object;
typedef struct _amqp_channel_resource amqp_channel_resource;
typedef struct _amqp_channel_callbacks amqp_channel_callbacks;
typedef struct _amqp_callback_bucket amqp_callback_bucket;
#if PHP_VERSION_ID < 50600
// should never get her, but just in case
#error PHP >= 5.6 required
#endif
#if PHP_MAJOR_VERSION >= 7
#include "php7_support.h"
#else
#include "php5_support.h"
#endif
#include "amqp_connection_resource.h"
#include <amqp.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) */
/* We don't support no-wait flag */
#define PHP_AMQP_QUEUE_FLAGS (AMQP_PASSIVE | AMQP_DURABLE | AMQP_EXCLUSIVE | AMQP_AUTODELETE)
#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"
struct _amqp_channel_resource {
char is_connected;
amqp_channel_t channel_id;
amqp_connection_resource *connection_resource;
amqp_channel_object *parent;
};
struct _amqp_callback_bucket {
zend_fcall_info fci;
zend_fcall_info_cache fcc;
};
struct _amqp_channel_callbacks {
amqp_callback_bucket basic_return;
amqp_callback_bucket basic_ack;
amqp_callback_bucket basic_nack;
};
/* NOTE: due to how internally PHP works with custom object, zend_object position in structure matters */
struct _amqp_channel_object {
#if PHP_MAJOR_VERSION >= 7
amqp_channel_callbacks callbacks;
zval *gc_data;
int gc_data_count;
amqp_channel_resource *channel_resource;
zend_object zo;
#else
zend_object zo;
zval *this_ptr;
amqp_channel_resource *channel_resource;
amqp_channel_callbacks callbacks;
zval **gc_data;
long gc_data_count;
#endif
};
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;
amqp_connection_state_t connection_state;
amqp_socket_t *socket;
};
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
};
-#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"
-#define DEFAULT_SASL_METHOD "0"
+#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_RPC_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"
+#define DEFAULT_PREFETCH_SIZE "0"
+#define DEFAULT_GLOBAL_PREFETCH_COUNT "0"
+#define DEFAULT_GLOBAL_PREFETCH_SIZE "0"
+#define DEFAULT_SASL_METHOD "0"
/* 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 */
#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 DEFAULT_CACERT ""
#define DEFAULT_CERT ""
#define DEFAULT_KEY ""
#define DEFAULT_VERIFY "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 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 PHP_AMQP_READ_THIS_PROP_CE(name, ce) zend_read_property((ce), getThis(), ZEND_STRL(name), 0 PHP5to7_READ_PROP_RV_PARAM_CC TSRMLS_CC)
#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))
#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));
}
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 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 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) (IS_OBJECT == Z_TYPE_P(obj) ? (PHP_AMQP_GET_CHANNEL(obj))->channel_resource : NULL)
#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; \
#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 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 PHP_AMQP_VERIFY_CHANNEL_RESOURCE(resource, error) \
if (!resource) { \
PHP_AMQP_VERIFY_CHANNEL_ERROR(error, "Stale reference to the channel object.") \
} \
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 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 (!(resource)->connection_resource->is_connected) { \
PHP_AMQP_VERIFY_CONNECTION_ERROR(error, "No connection available.") \
} \
#define PHP_AMQP_MAYBE_ERROR(res, channel_resource) (\
(AMQP_RESPONSE_NORMAL != (res).reply_type) \
&& \
PHP_AMQP_RESOURCE_RESPONSE_OK != php_amqp_error(res, &PHP_AMQP_G(error_message), (channel_resource)->connection_resource, (channel_resource) TSRMLS_CC) \
)
#define PHP_AMQP_MAYBE_ERROR_RECOVERABLE(res, channel_resource) (\
(AMQP_RESPONSE_NORMAL != (res).reply_type) \
&& \
PHP_AMQP_RESOURCE_RESPONSE_OK != php_amqp_error_advanced(res, &PHP_AMQP_G(error_message), (channel_resource)->connection_resource, (channel_resource), 0 TSRMLS_CC) \
)
#define PHP_AMQP_IS_ERROR_RECOVERABLE(res, channel_resource, channel_object) ( \
AMQP_RESPONSE_LIBRARY_EXCEPTION == (res).reply_type && AMQP_STATUS_UNEXPECTED_STATE == (res).library_error \
&& (0 <= php_amqp_connection_resource_error_advanced(res, &PHP_AMQP_G(error_message), (channel_resource)->connection_resource, (amqp_channel_t)(channel_resource ? (channel_resource)->channel_id : 0), (channel_object) TSRMLS_CC)) \
)
#if ZEND_MODULE_API_NO >= 20100000
#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
#define AMQP_ERROR_CATEGORY_MASK (1 << 29)
#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
ZEND_BEGIN_MODULE_GLOBALS(amqp)
char *error_message;
PHP5to7_param_long_type_t error_code;
ZEND_END_MODULE_GLOBALS(amqp)
ZEND_EXTERN_MODULE_GLOBALS(amqp);
#ifdef ZEND_MODULE_GLOBALS_ACCESSOR
#define PHP_AMQP_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(amqp, v)
#if defined(ZTS) && defined(COMPILE_DL_WEAK)
ZEND_TSRMLS_CACHE_EXTERN();
#endif
#else
#ifdef ZTS
#define PHP_AMQP_G(v) TSRMG(amqp_globals_id, zend_amqp_globals *, v)
#else
#define PHP_AMQP_G(v) (amqp_globals.v)
#endif
#endif
#ifndef PHP_AMQP_VERSION
-#define PHP_AMQP_VERSION "1.9.4"
+#define PHP_AMQP_VERSION "1.10.2"
#endif
#ifndef PHP_AMQP_REVISION
#define PHP_AMQP_REVISION "release"
#endif
int php_amqp_error(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *connection_resource, amqp_channel_resource *channel_resource TSRMLS_DC);
int php_amqp_error_advanced(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *connection_resource, amqp_channel_resource *channel_resource, int fail_on_errors TSRMLS_DC);
/**
* @deprecated
*/
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_zend_throw_exception_short(amqp_rpc_reply_t reply, zend_class_entry *exception_ce TSRMLS_DC);
void php_amqp_maybe_release_buffers_on_channel(amqp_connection_resource *connection_resource, amqp_channel_resource *channel_resource);
#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.9.4/stubs/AMQP.php b/amqp-1.10.2/stubs/AMQP.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQP.php
rename to amqp-1.10.2/stubs/AMQP.php
diff --git a/amqp-1.9.4/stubs/AMQPBasicProperties.php b/amqp-1.10.2/stubs/AMQPBasicProperties.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPBasicProperties.php
rename to amqp-1.10.2/stubs/AMQPBasicProperties.php
diff --git a/amqp-1.9.4/stubs/AMQPChannel.php b/amqp-1.10.2/stubs/AMQPChannel.php
similarity index 77%
rename from amqp-1.9.4/stubs/AMQPChannel.php
rename to amqp-1.10.2/stubs/AMQPChannel.php
index a31c837..11d8ed0 100644
--- a/amqp-1.9.4/stubs/AMQPChannel.php
+++ b/amqp-1.10.2/stubs/AMQPChannel.php
@@ -1,267 +1,320 @@
<?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()
{
}
/**
* Closes the channel.
*/
public function close()
{
}
/**
* 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.
+ * @param integer $size The window size, in octets, to prefetch.
+ * @param integer $count The number of messages to prefetch.
+ * @param bool $global TRUE for global, FALSE for consumer. FALSE by default.
*
* @throws AMQPConnectionException If the connection to the broker was lost.
*
* @return bool TRUE on success or FALSE on failure.
*/
- public function qos($size, $count)
+ public function qos($size, $count, $global)
{
}
/**
* 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 for each consumer.
*
* 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.
+ * AMQPQueue::consume() or AMQPQueue::get().
*
* @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.
+ * Get the number of messages to prefetch from the broker for each consumer.
*
* @return integer
*/
public function getPrefetchCount()
{
}
/**
- * Set the window size to prefetch from the broker.
+ * Set the window size to prefetch from the broker for each consumer.
*
* 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.
+ * Get the window size to prefetch from the broker for each consumer.
*
* @return integer
*/
public function getPrefetchSize()
{
}
+ /**
+ * Set the number of messages to prefetch from the broker across all consumers.
+ *
+ * Set the number of messages to prefetch from the broker during a call to
+ * AMQPQueue::consume() or AMQPQueue::get().
+ *
+ * @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 setGlobalPrefetchCount($count)
+ {
+ }
+
+ /**
+ * Get the number of messages to prefetch from the broker across all consumers.
+ *
+ * @return integer
+ */
+ public function getGlobalPrefetchCount()
+ {
+ }
+
+ /**
+ * Set the window size to prefetch from the broker for all consumers.
+ *
+ * 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 setGlobalPrefetchSize($size)
+ {
+ }
+
+ /**
+ * Get the window size to prefetch from the broker for all consumers.
+ *
+ * @return integer
+ */
+ public function getGlobalPrefetchSize()
+ {
+ }
+
/**
* 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)
{
}
/**
* Set the channel to use publisher acknowledgements. This can only used on a non-transactional channel.
*/
public function confirmSelect()
{
}
/**
* Set callback to process basic.ack and basic.nac AMQP server methods (applicable when channel in confirm mode).
*
* @param callable|null $ack_callback
* @param callable|null $nack_callback
*
* Callback functions with all arguments have the following signature:
*
* function ack_callback(int $delivery_tag, bool $multiple) : bool;
* function nack_callback(int $delivery_tag, bool $multiple, bool $requeue) : bool;
*
* and should return boolean false when wait loop should be canceled.
*
* Note, basic.nack server method will only be delivered if an internal error occurs in the Erlang process
* responsible for a queue (see https://www.rabbitmq.com/confirms.html for details).
*
*/
public function setConfirmCallback(callable $ack_callback=null, callable $nack_callback=null)
{
}
/**
* Wait until all messages published since the last call have been either ack'd or nack'd by the broker.
*
* Note, this method also catch all basic.return message from server.
*
* @param float $timeout Timeout in seconds. May be fractional.
*/
public function waitForConfirm($timeout = 0.0)
{
}
/**
* Set callback to process basic.return AMQP server method
*
* @param callable|null $return_callback
*
* Callback function with all arguments has the following signature:
*
* function callback(int $reply_code,
* string $reply_text,
* string $exchange,
* string $routing_key,
* AMQPBasicProperties $properties,
* string $body) : bool;
*
* and should return boolean false when wait loop should be canceled.
*
*/
public function setReturnCallback(callable $return_callback=null)
{
}
/**
* Start wait loop for basic.return AMQP server methods
*
* @param float $timeout Timeout in seconds. May be fractional.
*/
public function waitForBasicReturn($timeout = 0.0)
{
}
/**
* Return array of current consumers where key is consumer and value is AMQPQueue consumer is running on
*
* @return AMQPQueue[]
*/
public function getConsumers()
{
}
}
diff --git a/amqp-1.9.4/stubs/AMQPChannelException.php b/amqp-1.10.2/stubs/AMQPChannelException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPChannelException.php
rename to amqp-1.10.2/stubs/AMQPChannelException.php
diff --git a/amqp-1.9.4/stubs/AMQPConnection.php b/amqp-1.10.2/stubs/AMQPConnection.php
similarity index 96%
rename from amqp-1.9.4/stubs/AMQPConnection.php
rename to amqp-1.10.2/stubs/AMQPConnection.php
index 0a0a70c..53ff399 100644
--- a/amqp-1.9.4/stubs/AMQPConnection.php
+++ b/amqp-1.10.2/stubs/AMQPConnection.php
@@ -1,453 +1,475 @@
<?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.
+ * 'rpc_timeout' => RPC 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.
*
* TLS support (see https://www.rabbitmq.com/ssl.html for details):
* 'cacert' => Path to the CA cert file in PEM format..
* 'cert' => Path to the client certificate in PEM foramt.
* 'key' => Path to the client key in PEM format.
* 'verify' => Enable or disable peer verification. If peer verification is enabled then the common name in the
* server certificate must match the server name. Peer verification is enabled by default.
* )
*
* @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()
{
}
+ /**
+ * Sets the interval of time to wait for RPC activity to AMQP broker
+ *
+ * @param int $timeout
+ *
+ * @return bool
+ */
+ public function setRpcTimeout($timeout)
+ {
+ }
+
+ /**
+ * Get the configured interval of time to wait for RPC activity
+ * to AMQP broker
+ *
+ * @return float
+ */
+ public function getRpcTimeout()
+ {
+ }
+
/**
* Return last used channel id during current connection session.
*
* @return int
*/
public function getUsedChannels()
{
}
/**
* Get the maximum number of channels the connection can handle.
*
* When connection is connected, effective connection value returned, which is normally the same as original
* correspondent value passed to constructor, otherwise original value passed to constructor returned.
*
* @return int
*/
public function getMaxChannels()
{
}
/**
* Get max supported frame size per connection in bytes.
*
* When connection is connected, effective connection value returned, which is normally the same as original
* correspondent value passed to constructor, otherwise original value passed to constructor returned.
*
* @return int
*/
public function getMaxFrameSize()
{
}
/**
* Get number of seconds between heartbeats of the connection in seconds.
*
* When connection is connected, effective connection value returned, which is normally the same as original
* correspondent value passed to constructor, otherwise original value passed to constructor returned.
*
* @return int
*/
public function getHeartbeatInterval()
{
}
/**
* Whether connection persistent.
*
* When connection is not connected, boolean false always returned
*
* @return bool
*/
public function isPersistent()
{
}
/**
* Get path to the CA cert file in PEM format
*
* @return string
*/
public function getCACert()
{
}
/**
* Set path to the CA cert file in PEM format
*
* @param string $cacert
*/
public function setCACert($cacert)
{
}
/**
* Get path to the client certificate in PEM format
*
* @return string
*/
public function getCert()
{
}
/**
* Set path to the client certificate in PEM format
*
* @param string $cert
*/
public function setCert($cert)
{
}
/**
* Get path to the client key in PEM format
*
* @return string
*/
public function getKey()
{
}
/**
* Set path to the client key in PEM format
*
* @param string $key
*/
public function setKey($key)
{
}
/**
* Get whether peer verification enabled or disabled
*
* @return bool
*/
public function getVerify()
{
}
/**
* Enable or disable peer verification
*
* @param bool $verify
*/
public function setVerify($verify)
{
}
/**
* set authentication method
*
* @param int $method AMQP_SASL_METHOD_PLAIN | AMQP_SASL_METHOD_EXTERNAL
*/
public function setSaslMethod($method)
{
}
/**
* @return int
*/
public function getSaslMethod()
{
}
}
diff --git a/amqp-1.9.4/stubs/AMQPConnectionException.php b/amqp-1.10.2/stubs/AMQPConnectionException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPConnectionException.php
rename to amqp-1.10.2/stubs/AMQPConnectionException.php
diff --git a/amqp-1.9.4/stubs/AMQPDecimal.php b/amqp-1.10.2/stubs/AMQPDecimal.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPDecimal.php
rename to amqp-1.10.2/stubs/AMQPDecimal.php
diff --git a/amqp-1.9.4/stubs/AMQPEnvelope.php b/amqp-1.10.2/stubs/AMQPEnvelope.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPEnvelope.php
rename to amqp-1.10.2/stubs/AMQPEnvelope.php
diff --git a/amqp-1.9.4/stubs/AMQPEnvelopeException.php b/amqp-1.10.2/stubs/AMQPEnvelopeException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPEnvelopeException.php
rename to amqp-1.10.2/stubs/AMQPEnvelopeException.php
diff --git a/amqp-1.9.4/stubs/AMQPException.php b/amqp-1.10.2/stubs/AMQPException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPException.php
rename to amqp-1.10.2/stubs/AMQPException.php
diff --git a/amqp-1.9.4/stubs/AMQPExchange.php b/amqp-1.10.2/stubs/AMQPExchange.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPExchange.php
rename to amqp-1.10.2/stubs/AMQPExchange.php
diff --git a/amqp-1.9.4/stubs/AMQPExchangeException.php b/amqp-1.10.2/stubs/AMQPExchangeException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPExchangeException.php
rename to amqp-1.10.2/stubs/AMQPExchangeException.php
diff --git a/amqp-1.9.4/stubs/AMQPQueue.php b/amqp-1.10.2/stubs/AMQPQueue.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPQueue.php
rename to amqp-1.10.2/stubs/AMQPQueue.php
diff --git a/amqp-1.9.4/stubs/AMQPQueueException.php b/amqp-1.10.2/stubs/AMQPQueueException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPQueueException.php
rename to amqp-1.10.2/stubs/AMQPQueueException.php
diff --git a/amqp-1.9.4/stubs/AMQPTimestamp.php b/amqp-1.10.2/stubs/AMQPTimestamp.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPTimestamp.php
rename to amqp-1.10.2/stubs/AMQPTimestamp.php
diff --git a/amqp-1.9.4/stubs/AMQPValueException.php b/amqp-1.10.2/stubs/AMQPValueException.php
similarity index 100%
rename from amqp-1.9.4/stubs/AMQPValueException.php
rename to amqp-1.10.2/stubs/AMQPValueException.php
diff --git a/amqp-1.9.4/tests/003-channel-consumers.phpt b/amqp-1.10.2/tests/003-channel-consumers.phpt
similarity index 100%
rename from amqp-1.9.4/tests/003-channel-consumers.phpt
rename to amqp-1.10.2/tests/003-channel-consumers.phpt
diff --git a/amqp-1.9.4/tests/004-queue-consume-nested.phpt b/amqp-1.10.2/tests/004-queue-consume-nested.phpt
similarity index 100%
rename from amqp-1.9.4/tests/004-queue-consume-nested.phpt
rename to amqp-1.10.2/tests/004-queue-consume-nested.phpt
diff --git a/amqp-1.9.4/tests/004-queue-consume-orphaned.phpt b/amqp-1.10.2/tests/004-queue-consume-orphaned.phpt
similarity index 100%
rename from amqp-1.9.4/tests/004-queue-consume-orphaned.phpt
rename to amqp-1.10.2/tests/004-queue-consume-orphaned.phpt
diff --git a/amqp-1.9.4/tests/_test_helpers.php.inc b/amqp-1.10.2/tests/_test_helpers.php.inc
similarity index 100%
rename from amqp-1.9.4/tests/_test_helpers.php.inc
rename to amqp-1.10.2/tests/_test_helpers.php.inc
diff --git a/amqp-1.9.4/tests/amqpbasicproperties.phpt b/amqp-1.10.2/tests/amqpbasicproperties.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpbasicproperties.phpt
rename to amqp-1.10.2/tests/amqpbasicproperties.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_basicRecover.phpt b/amqp-1.10.2/tests/amqpchannel_basicRecover.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_basicRecover.phpt
rename to amqp-1.10.2/tests/amqpchannel_basicRecover.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_close.phpt b/amqp-1.10.2/tests/amqpchannel_close.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_close.phpt
rename to amqp-1.10.2/tests/amqpchannel_close.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_confirmSelect.phpt b/amqp-1.10.2/tests/amqpchannel_confirmSelect.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_confirmSelect.phpt
rename to amqp-1.10.2/tests/amqpchannel_confirmSelect.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_construct_basic.phpt b/amqp-1.10.2/tests/amqpchannel_construct_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_construct_basic.phpt
rename to amqp-1.10.2/tests/amqpchannel_construct_basic.phpt
diff --git a/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_count.phpt b/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_count.phpt
new file mode 100644
index 0000000..3cda544
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_count.phpt
@@ -0,0 +1,26 @@
+--TEST--
+AMQPChannel - constructor with amqp.global_prefetch_count ini value set
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+}
+?>
+--INI--
+amqp.global_prefetch_count=123
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+?>
+--EXPECT--
+int(123)
+int(0)
+int(3)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_size.phpt b/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_size.phpt
new file mode 100644
index 0000000..82b9593
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_construct_ini_global_prefetch_size.phpt
@@ -0,0 +1,37 @@
+--TEST--
+AMQPChannel - constructor with amqp.global_prefetch_size ini value set
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+} else {
+ try {
+ $cnn = new AMQPConnection();
+ $cnn->connect();
+ $ch = new AMQPChannel($cnn);
+ $ch->setGlobalPrefetchSize(123);
+ } catch (AMQPConnectionException $e) {
+ if ($e->getCode() === 540 && strpos($e->getMessage(), "NOT_IMPLEMENTED") !== false) {
+ print "skip";
+ }
+ }
+}
+?>
+--INI--
+amqp.global_prefetch_size=123
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+?>
+--EXPECT--
+int(0)
+int(123)
+int(3)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_count.phpt b/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_count.phpt
new file mode 100644
index 0000000..def1c3f
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_count.phpt
@@ -0,0 +1,26 @@
+--TEST--
+AMQPChannel - constructor with amqp.prefetch_count ini value set
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+}
+?>
+--INI--
+amqp.prefetch_count=123
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+?>
+--EXPECT--
+int(0)
+int(0)
+int(123)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_size.phpt b/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_size.phpt
new file mode 100644
index 0000000..fc999d1
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_construct_ini_prefetch_size.phpt
@@ -0,0 +1,37 @@
+--TEST--
+AMQPChannel - constructor with amqp.prefetch_size ini value set
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+} else {
+ try {
+ $cnn = new AMQPConnection();
+ $cnn->connect();
+ $ch = new AMQPChannel($cnn);
+ $ch->setPrefetchSize(123);
+ } catch (AMQPConnectionException $e) {
+ if ($e->getCode() === 540 && strpos($e->getMessage(), "NOT_IMPLEMENTED") !== false) {
+ print "skip";
+ }
+ }
+}
+?>
+--INI--
+amqp.prefetch_size=123
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(123)
diff --git a/amqp-1.9.4/tests/amqpchannel_getChannelId.phpt b/amqp-1.10.2/tests/amqpchannel_getChannelId.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_getChannelId.phpt
rename to amqp-1.10.2/tests/amqpchannel_getChannelId.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_get_connection.phpt b/amqp-1.10.2/tests/amqpchannel_get_connection.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_get_connection.phpt
rename to amqp-1.10.2/tests/amqpchannel_get_connection.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_multi_channel_connection.phpt b/amqp-1.10.2/tests/amqpchannel_multi_channel_connection.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_multi_channel_connection.phpt
rename to amqp-1.10.2/tests/amqpchannel_multi_channel_connection.phpt
diff --git a/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_count.phpt b/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_count.phpt
new file mode 100644
index 0000000..a0a2ee4
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_count.phpt
@@ -0,0 +1,36 @@
+--TEST--
+AMQPChannel::setGlobalPrefetchCount
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setGlobalPrefetchCount(123);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(123)
+int(0)
+int(3)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_size.phpt b/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_size.phpt
new file mode 100644
index 0000000..46d8b04
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_global_prefetch_size.phpt
@@ -0,0 +1,47 @@
+--TEST--
+AMQPChannel::setGlobalPrefetchSize
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+} else {
+ try {
+ $cnn = new AMQPConnection();
+ $cnn->connect();
+ $ch = new AMQPChannel($cnn);
+ $ch->setGlobalPrefetchSize(123);
+ } catch (AMQPConnectionException $e) {
+ if ($e->getCode() === 540 && strpos($e->getMessage(), "NOT_IMPLEMENTED") !== false) {
+ print "skip";
+ }
+ }
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setGlobalPrefetchSize(123);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(0)
+int(123)
+int(3)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_count.phpt b/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_count.phpt
new file mode 100644
index 0000000..1034a0e
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_count.phpt
@@ -0,0 +1,60 @@
+--TEST--
+AMQPChannel - Setting both consumer and channel wide prefetch counts.
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setPrefetchCount(11);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+// Shouldn't affect the prefetch count
+$ch->setGlobalPrefetchCount(22);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+// Shouldn't affect the global prefetch count
+$ch->setPrefetchCount(33);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(0)
+int(0)
+int(11)
+int(0)
+int(22)
+int(0)
+int(11)
+int(0)
+int(22)
+int(0)
+int(33)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_size.phpt b/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_size.phpt
new file mode 100644
index 0000000..ef01d0c
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_prefetch_and_global_prefetch_size.phpt
@@ -0,0 +1,72 @@
+--TEST--
+AMQPChannel - Setting both consumer and channel wide prefetch sizes.
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+} else {
+ try {
+ $cnn = new AMQPConnection();
+ $cnn->connect();
+ $ch = new AMQPChannel($cnn);
+ $ch->setPrefetchSize(123);
+ $ch->setGlobalPrefetchSize(123);
+ } catch (AMQPConnectionException $e) {
+ if ($e->getCode() === 540 && strpos($e->getMessage(), "NOT_IMPLEMENTED") !== false) {
+ print "skip";
+ }
+ }
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setPrefetchSize(11);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+// Shouldn't affect the prefetch count
+$ch->setGlobalPrefetchSize(22);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+// Shouldn't affect the global prefetch count
+$ch->setPrefetchSize(33);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(0)
+int(0)
+int(0)
+int(11)
+int(0)
+int(22)
+int(0)
+int(11)
+int(0)
+int(22)
+int(0)
+int(33)
diff --git a/amqp-1.10.2/tests/amqpchannel_set_prefetch_count.phpt b/amqp-1.10.2/tests/amqpchannel_set_prefetch_count.phpt
new file mode 100644
index 0000000..c8faf5c
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_prefetch_count.phpt
@@ -0,0 +1,36 @@
+--TEST--
+AMQPChannel::setPrefetchCount
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setPrefetchCount(123);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(0)
+int(0)
+int(123)
+int(0)
diff --git a/amqp-1.10.2/tests/amqpchannel_set_prefetch_size.phpt b/amqp-1.10.2/tests/amqpchannel_set_prefetch_size.phpt
new file mode 100644
index 0000000..d415411
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpchannel_set_prefetch_size.phpt
@@ -0,0 +1,47 @@
+--TEST--
+AMQPChannel::setPrefetchSize
+--SKIPIF--
+<?php
+if (!extension_loaded("amqp")) {
+ print "skip";
+} else {
+ try {
+ $cnn = new AMQPConnection();
+ $cnn->connect();
+ $ch = new AMQPChannel($cnn);
+ $ch->setPrefetchSize(123);
+ } catch (AMQPConnectionException $e) {
+ if ($e->getCode() === 540 && strpos($e->getMessage(), "NOT_IMPLEMENTED") !== false) {
+ print "skip";
+ }
+ }
+}
+?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+$cnn->connect();
+$ch = new AMQPChannel($cnn);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+$ch->setPrefetchSize(123);
+
+var_dump($ch->getGlobalPrefetchCount());
+var_dump($ch->getGlobalPrefetchSize());
+var_dump($ch->getPrefetchCount());
+var_dump($ch->getPrefetchSize());
+
+?>
+--EXPECT--
+int(0)
+int(0)
+int(3)
+int(0)
+int(0)
+int(0)
+int(0)
+int(123)
diff --git a/amqp-1.9.4/tests/amqpchannel_slots_usage.phpt b/amqp-1.10.2/tests/amqpchannel_slots_usage.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpchannel_slots_usage.phpt
rename to amqp-1.10.2/tests/amqpchannel_slots_usage.phpt
diff --git a/amqp-1.9.4/tests/amqpchannel_var_dump.phpt b/amqp-1.10.2/tests/amqpchannel_var_dump.phpt
similarity index 81%
rename from amqp-1.9.4/tests/amqpchannel_var_dump.phpt
rename to amqp-1.10.2/tests/amqpchannel_var_dump.phpt
index 26a4d6f..e56cac3 100644
--- a/amqp-1.9.4/tests/amqpchannel_var_dump.phpt
+++ b/amqp-1.10.2/tests/amqpchannel_var_dump.phpt
@@ -1,108 +1,124 @@
--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) {
+object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(0) {
}
}
-object(AMQPChannel)#2 (4) {
+object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(0) {
}
}
diff --git a/amqp-1.9.4/tests/amqpconnection_connect_login_failure.phpt b/amqp-1.10.2/tests/amqpconnection_connect_login_failure.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_connect_login_failure.phpt
rename to amqp-1.10.2/tests/amqpconnection_connect_login_failure.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_connection_getters.phpt b/amqp-1.10.2/tests/amqpconnection_connection_getters.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_connection_getters.phpt
rename to amqp-1.10.2/tests/amqpconnection_connection_getters.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_basic.phpt b/amqp-1.10.2/tests/amqpconnection_construct_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_basic.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_ini_read_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_ini_read_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_ini_read_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_ini_read_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_ini_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_ini_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_ini_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_ini_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_ini_timeout_and_read_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_ini_timeout_default.phpt b/amqp-1.10.2/tests/amqpconnection_construct_ini_timeout_default.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_ini_timeout_default.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_ini_timeout_default.phpt
diff --git a/amqp-1.10.2/tests/amqpconnection_construct_params_by_value.phpt b/amqp-1.10.2/tests/amqpconnection_construct_params_by_value.phpt
new file mode 100644
index 0000000..fadc925
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpconnection_construct_params_by_value.phpt
@@ -0,0 +1,44 @@
+--TEST--
+Params are passed by value in AMQPConnection::__construct()
+
+--SKIPIF--
+<?php if (!extension_loaded("amqp")) die("Skip: ext/amqp must be installed."); ?>
+
+--FILE--
+<?php
+
+$params = [
+ 'host' => 'localhost',
+ 'port' => 5432,
+ 'login' => 'login',
+ 'password' => 'password',
+ 'read_timeout' => 10,
+ 'write_timeout' => 10,
+ 'connect_timeout' => 10,
+ 'rpc_timeout' => 10,
+ 'connection_name' => 'custom_connection_name'
+];
+
+$conn = new \AMQPConnection($params);
+
+echo gettype($params['host']) . PHP_EOL;
+echo gettype($params['port']) . PHP_EOL;
+echo gettype($params['login']) . PHP_EOL;
+echo gettype($params['password']) . PHP_EOL;
+
+echo gettype($params['read_timeout']) . PHP_EOL;
+echo gettype($params['write_timeout']) . PHP_EOL;
+echo gettype($params['connect_timeout']) . PHP_EOL;
+echo gettype($params['rpc_timeout']) . PHP_EOL;
+echo gettype($params['connection_name']) . PHP_EOL;
+
+--EXPECT--
+string
+integer
+string
+string
+integer
+integer
+integer
+integer
+string
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_connect_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_connect_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_with_connect_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_with_connect_timeout.phpt
diff --git a/amqp-1.10.2/tests/amqpconnection_construct_with_connection_name.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_connection_name.phpt
new file mode 100644
index 0000000..4d6915d
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpconnection_construct_with_connection_name.phpt
@@ -0,0 +1,18 @@
+--TEST--
+AMQPConnection constructor with connection_name parameter in creadentials
+--SKIPIF--
+<?php if (!extension_loaded("amqp")) print "skip"; ?>
+--FILE--
+<?php
+// Test connection name as a string
+$credentials = array('connection_name' => "custom connection name");
+$cnn = new AMQPConnection($credentials);
+var_dump($cnn->getConnectionName());
+// Test explicitly setting connection name as null
+$credentials = array('connection_name' => null);
+$cnn = new AMQPConnection($credentials);
+var_dump($cnn->getConnectionName());
+?>
+--EXPECT--
+string(22) "custom connection name"
+NULL
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_limits.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_limits.phpt
similarity index 89%
rename from amqp-1.9.4/tests/amqpconnection_construct_with_limits.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_with_limits.phpt
index 1980b7c..c8c8b3f 100644
--- a/amqp-1.9.4/tests/amqpconnection_construct_with_limits.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_construct_with_limits.phpt
@@ -1,51 +1,55 @@
--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);
?>
--EXPECT--
-object(AMQPConnection)#1 (16) {
+object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(10)
["frame_max":"AMQPConnection":private]=>
int(10240)
["heartbeat":"AMQPConnection":private]=>
int(5)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_write_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_rpc_timeout.phpt
similarity index 50%
copy from amqp-1.9.4/tests/amqpconnection_construct_with_write_timeout.phpt
copy to amqp-1.10.2/tests/amqpconnection_construct_with_rpc_timeout.phpt
index 27e1151..4eb6097 100644
--- a/amqp-1.9.4/tests/amqpconnection_construct_with_write_timeout.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_construct_with_rpc_timeout.phpt
@@ -1,12 +1,12 @@
--TEST--
-AMQPConnection constructor with write_timeout parameter in creadentials
+AMQPConnection constructor with rpc_timeout parameter in creadentials
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
-$credentials = array('write_timeout' => 303.303);
+$credentials = array('rpc_timeout' => 303.303);
$cnn = new AMQPConnection($credentials);
-var_dump($cnn->getWriteTimeout());
+var_dump($cnn->getRpcTimeout());
?>
--EXPECT--
float(303.303)
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_with_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_with_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_with_timeout_and_read_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_construct_with_write_timeout.phpt b/amqp-1.10.2/tests/amqpconnection_construct_with_write_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_construct_with_write_timeout.phpt
rename to amqp-1.10.2/tests/amqpconnection_construct_with_write_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_getUsedChannels.phpt b/amqp-1.10.2/tests/amqpconnection_getUsedChannels.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_getUsedChannels.phpt
rename to amqp-1.10.2/tests/amqpconnection_getUsedChannels.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_heartbeat.phpt b/amqp-1.10.2/tests/amqpconnection_heartbeat.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_heartbeat.phpt
rename to amqp-1.10.2/tests/amqpconnection_heartbeat.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_heartbeat_with_consumer.phpt b/amqp-1.10.2/tests/amqpconnection_heartbeat_with_consumer.phpt
similarity index 94%
rename from amqp-1.9.4/tests/amqpconnection_heartbeat_with_consumer.phpt
rename to amqp-1.10.2/tests/amqpconnection_heartbeat_with_consumer.phpt
index 3865b3b..df40041 100644
--- a/amqp-1.9.4/tests/amqpconnection_heartbeat_with_consumer.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_heartbeat_with_consumer.phpt
@@ -1,100 +1,104 @@
--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 (16) {
+object(AMQPConnection)#1 (18) {
["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(40)
["write_timeout":"AMQPConnection":private]=>
float(0)
["connect_timeout":"AMQPConnection":private]=>
float(0)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(2)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
Consumed: test message 1 (should be dead lettered)
Consuming took: %fsec
Timing OK (%f < %f < %f)
Done
diff --git a/amqp-1.9.4/tests/amqpconnection_heartbeat_with_persistent.phpt b/amqp-1.10.2/tests/amqpconnection_heartbeat_with_persistent.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_heartbeat_with_persistent.phpt
rename to amqp-1.10.2/tests/amqpconnection_heartbeat_with_persistent.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_persistent_construct_basic.phpt b/amqp-1.10.2/tests/amqpconnection_persistent_construct_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_persistent_construct_basic.phpt
rename to amqp-1.10.2/tests/amqpconnection_persistent_construct_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_persistent_in_use.phpt b/amqp-1.10.2/tests/amqpconnection_persistent_in_use.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_persistent_in_use.phpt
rename to amqp-1.10.2/tests/amqpconnection_persistent_in_use.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_persistent_reusable.phpt b/amqp-1.10.2/tests/amqpconnection_persistent_reusable.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_persistent_reusable.phpt
rename to amqp-1.10.2/tests/amqpconnection_persistent_reusable.phpt
diff --git a/amqp-1.10.2/tests/amqpconnection_setConnectionName.phpt b/amqp-1.10.2/tests/amqpconnection_setConnectionName.phpt
new file mode 100644
index 0000000..ba1f85e
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpconnection_setConnectionName.phpt
@@ -0,0 +1,16 @@
+--TEST--
+AMQPConnection setConnectionName
+--SKIPIF--
+<?php if (!extension_loaded("amqp")) print "skip"; ?>
+--FILE--
+<?php
+$cnn = new AMQPConnection();
+var_dump($cnn->getConnectionName());
+$cnn->setConnectionName('custom connection name');
+var_dump($cnn->getConnectionName());
+$cnn->setConnectionName(null);
+var_dump($cnn->getConnectionName());
+--EXPECTF--
+NULL
+string(22) "custom connection name"
+NULL
\ No newline at end of file
diff --git a/amqp-1.9.4/tests/amqpconnection_setHost.phpt b/amqp-1.10.2/tests/amqpconnection_setHost.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setHost.phpt
rename to amqp-1.10.2/tests/amqpconnection_setHost.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setLogin.phpt b/amqp-1.10.2/tests/amqpconnection_setLogin.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setLogin.phpt
rename to amqp-1.10.2/tests/amqpconnection_setLogin.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setPassword.phpt b/amqp-1.10.2/tests/amqpconnection_setPassword.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setPassword.phpt
rename to amqp-1.10.2/tests/amqpconnection_setPassword.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setPort_int.phpt b/amqp-1.10.2/tests/amqpconnection_setPort_int.phpt
similarity index 65%
rename from amqp-1.9.4/tests/amqpconnection_setPort_int.phpt
rename to amqp-1.10.2/tests/amqpconnection_setPort_int.phpt
index f5a2693..b7cc3f7 100644
--- a/amqp-1.9.4/tests/amqpconnection_setPort_int.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_setPort_int.phpt
@@ -1,13 +1,16 @@
--TEST--
AMQPConnection constructor
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
$cnn = new AMQPConnection();
-echo var_export($cnn->setPort(12345), true), PHP_EOL;
+$port = 12345;
+echo var_export($cnn->setPort($port), true), PHP_EOL;
echo $cnn->getPort(), PHP_EOL;
+echo gettype($port), PHP_EOL;
?>
--EXPECT--
true
12345
+integer
diff --git a/amqp-1.9.4/tests/amqpconnection_setPort_out_of_range.phpt b/amqp-1.10.2/tests/amqpconnection_setPort_out_of_range.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setPort_out_of_range.phpt
rename to amqp-1.10.2/tests/amqpconnection_setPort_out_of_range.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setPort_string.phpt b/amqp-1.10.2/tests/amqpconnection_setPort_string.phpt
similarity index 56%
rename from amqp-1.9.4/tests/amqpconnection_setPort_string.phpt
rename to amqp-1.10.2/tests/amqpconnection_setPort_string.phpt
index 603de0d..7aa5afe 100644
--- a/amqp-1.9.4/tests/amqpconnection_setPort_string.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_setPort_string.phpt
@@ -1,11 +1,16 @@
--TEST--
AMQPConnection setPort with string
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
$cnn = new AMQPConnection();
-echo $cnn->setPort('12345');
+$port = '12345';
+echo $cnn->setPort($port), PHP_EOL;
+var_dump($cnn->getPort());
+var_dump($port);
?>
--EXPECT--
-1
\ No newline at end of file
+1
+int(12345)
+string(5) "12345"
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_float.phpt b/amqp-1.10.2/tests/amqpconnection_setReadTimeout_float.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setReadTimeout_float.phpt
rename to amqp-1.10.2/tests/amqpconnection_setReadTimeout_float.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_int.phpt b/amqp-1.10.2/tests/amqpconnection_setReadTimeout_int.phpt
similarity index 100%
copy from amqp-1.9.4/tests/amqpconnection_setReadTimeout_int.phpt
copy to amqp-1.10.2/tests/amqpconnection_setReadTimeout_int.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_out_of_range.phpt b/amqp-1.10.2/tests/amqpconnection_setReadTimeout_out_of_range.phpt
similarity index 100%
copy from amqp-1.9.4/tests/amqpconnection_setReadTimeout_out_of_range.phpt
copy to amqp-1.10.2/tests/amqpconnection_setReadTimeout_out_of_range.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_string.phpt b/amqp-1.10.2/tests/amqpconnection_setReadTimeout_string.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setReadTimeout_string.phpt
rename to amqp-1.10.2/tests/amqpconnection_setReadTimeout_string.phpt
diff --git a/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_float.phpt b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_float.phpt
new file mode 100644
index 0000000..3aeb92c
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_float.phpt
@@ -0,0 +1,21 @@
+--TEST--
+AMQPConnection setRpcTimeout float
+--SKIPIF--
+<?php if (!extension_loaded("amqp")) print "skip"; ?>
+--FILE--
+<?php
+$timeout = .34;
+$cnn = new AMQPConnection();
+$cnn->setRpcTimeout($timeout);
+var_dump($cnn->getRpcTimeout());
+var_dump($timeout);
+$timeout = 4.7e-2;
+$cnn->setRpcTimeout($timeout);
+var_dump($cnn->getRpcTimeout());
+var_dump($timeout);
+?>
+--EXPECT--
+float(0.34)
+float(0.34)
+float(0.047)
+float(0.047)
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_int.phpt b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_int.phpt
similarity index 50%
rename from amqp-1.9.4/tests/amqpconnection_setReadTimeout_int.phpt
rename to amqp-1.10.2/tests/amqpconnection_setRpcTimeout_int.phpt
index 136744d..6219b47 100644
--- a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_int.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_int.phpt
@@ -1,12 +1,15 @@
--TEST--
-AMQPConnection setReadTimeout int
+AMQPConnection setRpcTimeout int
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
+$timeout = 3;
$cnn = new AMQPConnection();
-$cnn->setReadTimeout(3);
-var_dump($cnn->getReadTimeout());
+$cnn->setRpcTimeout($timeout);
+var_dump($cnn->getRpcTimeout());
+var_dump($timeout);
?>
--EXPECT--
float(3)
+int(3)
diff --git a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_out_of_range.phpt b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_out_of_range.phpt
similarity index 65%
rename from amqp-1.9.4/tests/amqpconnection_setReadTimeout_out_of_range.phpt
rename to amqp-1.10.2/tests/amqpconnection_setRpcTimeout_out_of_range.phpt
index 20e7ce5..c11cec4 100644
--- a/amqp-1.9.4/tests/amqpconnection_setReadTimeout_out_of_range.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_out_of_range.phpt
@@ -1,18 +1,18 @@
--TEST--
-AMQPConnection setReadTimeout out of range
+AMQPConnection setRpcTimeout out of range
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
$cnn = new AMQPConnection();
try {
- $cnn->setReadTimeout(-1);
+ $cnn->setRpcTimeout(-1);
} catch (Exception $e) {
echo get_class($e);
echo PHP_EOL;
echo $e->getMessage();
}
?>
--EXPECT--
AMQPConnectionException
-Parameter 'read_timeout' must be greater than or equal to zero.
+Parameter 'rpc_timeout' must be greater than or equal to zero.
diff --git a/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_string.phpt b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_string.phpt
new file mode 100644
index 0000000..807ec1f
--- /dev/null
+++ b/amqp-1.10.2/tests/amqpconnection_setRpcTimeout_string.phpt
@@ -0,0 +1,21 @@
+--TEST--
+AMQPConnection setRpcTimeout string
+--SKIPIF--
+<?php if (!extension_loaded("amqp")) print "skip"; ?>
+--FILE--
+<?php
+$timeout = ".34";
+$cnn = new AMQPConnection();
+$cnn->setRpcTimeout($timeout);
+var_dump($cnn->getRpcTimeout());
+var_dump($timeout);
+$timeout = "4.7e-2";
+$cnn->setRpcTimeout($timeout);
+var_dump($cnn->getRpcTimeout());
+var_dump($timeout);
+?>
+--EXPECT--
+float(0.34)
+string(3) ".34"
+float(0.047)
+string(6) "4.7e-2"
diff --git a/amqp-1.9.4/tests/amqpconnection_setSaslMethod.phpt b/amqp-1.10.2/tests/amqpconnection_setSaslMethod.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setSaslMethod.phpt
rename to amqp-1.10.2/tests/amqpconnection_setSaslMethod.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setSaslMethod_invalid.phpt b/amqp-1.10.2/tests/amqpconnection_setSaslMethod_invalid.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setSaslMethod_invalid.phpt
rename to amqp-1.10.2/tests/amqpconnection_setSaslMethod_invalid.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setTimeout_deprecated.phpt b/amqp-1.10.2/tests/amqpconnection_setTimeout_deprecated.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setTimeout_deprecated.phpt
rename to amqp-1.10.2/tests/amqpconnection_setTimeout_deprecated.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setTimeout_float.phpt b/amqp-1.10.2/tests/amqpconnection_setTimeout_float.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setTimeout_float.phpt
rename to amqp-1.10.2/tests/amqpconnection_setTimeout_float.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setTimeout_int.phpt b/amqp-1.10.2/tests/amqpconnection_setTimeout_int.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setTimeout_int.phpt
rename to amqp-1.10.2/tests/amqpconnection_setTimeout_int.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setTimeout_out_of_range.phpt b/amqp-1.10.2/tests/amqpconnection_setTimeout_out_of_range.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setTimeout_out_of_range.phpt
rename to amqp-1.10.2/tests/amqpconnection_setTimeout_out_of_range.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setTimeout_string.phpt b/amqp-1.10.2/tests/amqpconnection_setTimeout_string.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setTimeout_string.phpt
rename to amqp-1.10.2/tests/amqpconnection_setTimeout_string.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setVhost.phpt b/amqp-1.10.2/tests/amqpconnection_setVhost.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setVhost.phpt
rename to amqp-1.10.2/tests/amqpconnection_setVhost.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setWriteTimeout_float.phpt b/amqp-1.10.2/tests/amqpconnection_setWriteTimeout_float.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setWriteTimeout_float.phpt
rename to amqp-1.10.2/tests/amqpconnection_setWriteTimeout_float.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setWriteTimeout_int.phpt b/amqp-1.10.2/tests/amqpconnection_setWriteTimeout_int.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setWriteTimeout_int.phpt
rename to amqp-1.10.2/tests/amqpconnection_setWriteTimeout_int.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setWriteTimeout_out_of_range.phpt b/amqp-1.10.2/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
rename to amqp-1.10.2/tests/amqpconnection_setWriteTimeout_out_of_range.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_setWriteTimeout_string.phpt b/amqp-1.10.2/tests/amqpconnection_setWriteTimeout_string.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_setWriteTimeout_string.phpt
rename to amqp-1.10.2/tests/amqpconnection_setWriteTimeout_string.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_ssl.phpt b/amqp-1.10.2/tests/amqpconnection_ssl.phpt
similarity index 93%
rename from amqp-1.9.4/tests/amqpconnection_ssl.phpt
rename to amqp-1.10.2/tests/amqpconnection_ssl.phpt
index e6ba88d..c4d88e0 100644
--- a/amqp-1.9.4/tests/amqpconnection_ssl.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_ssl.phpt
@@ -1,133 +1,141 @@
--TEST--
AMQPConnection - ssl support
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
<?php if (true) print "skip - run ssl connection test manually"; ?>
--FILE--
<?php
/*
openssl s_server -accept 8443 \
-cert /home/vagrant/php-amqp/provision/test_certs/server/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/server/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
openssl s_client -connect localhost:8443 \
-cert /home/vagrant/php-amqp/provision/test_certs/client/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/client/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
# to connect to rabbitmq server manually
openssl s_client -connect localhost:5671 \
-cert /home/vagrant/php-amqp/provision/test_certs/client/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/client/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
*/
$credentials = array(
//'host' => gethostname(), //'vagrant-ubuntu-wily-64',
'port' => 5671,
'verify' => false,
'cacert' => __DIR__ . "/../provision/test_certs/testca/cacert.pem",
'cert' => __DIR__ . "/../provision/test_certs/client/cert.pem",
'key' => __DIR__ . "/../provision/test_certs/client/key.pem",
);
$cnn = new AMQPConnection($credentials);
var_dump($cnn);
$cnn->connect();
echo ($cnn->isConnected() ? 'connected' : 'disconnected'), PHP_EOL;
echo PHP_EOL;
$cnn = new AMQPConnection();
$cnn->setPort(5671);
$cnn->setCACert(__DIR__ . "/../provision/test_certs/testca/cacert.pem");
$cnn->setCert(__DIR__ . "/../provision/test_certs/client/cert.pem");
$cnn->setKey(__DIR__ . "/../provision/test_certs/client/key.pem");
$cnn->setVerify(false);
var_dump($cnn);
$cnn->connect();
echo ($cnn->isConnected() ? 'connected' : 'disconnected'), PHP_EOL;
//sleep(100);
?>
--EXPECTF--
-object(AMQPConnection)#1 (16) {
+object(AMQPConnection)#1 (18) {
["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(5671)
["read_timeout":"AMQPConnection":private]=>
float(0)
["write_timeout":"AMQPConnection":private]=>
float(0)
["connect_timeout":"AMQPConnection":private]=>
float(0)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/testca/cacert.pem"
["key":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/client/key.pem"
["cert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/client/cert.pem"
["verify":"AMQPConnection":private]=>
bool(false)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
connected
-object(AMQPConnection)#2 (16) {
+object(AMQPConnection)#2 (18) {
["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(5671)
["read_timeout":"AMQPConnection":private]=>
float(0)
["write_timeout":"AMQPConnection":private]=>
float(0)
["connect_timeout":"AMQPConnection":private]=>
float(0)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/testca/cacert.pem"
["key":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/client/key.pem"
["cert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/client/cert.pem"
["verify":"AMQPConnection":private]=>
bool(false)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
connected
diff --git a/amqp-1.9.4/tests/amqpconnection_ssl_by_cert.phpt b/amqp-1.10.2/tests/amqpconnection_ssl_by_cert.phpt
similarity index 94%
rename from amqp-1.9.4/tests/amqpconnection_ssl_by_cert.phpt
rename to amqp-1.10.2/tests/amqpconnection_ssl_by_cert.phpt
index aa6cc05..0a5c39e 100644
--- a/amqp-1.9.4/tests/amqpconnection_ssl_by_cert.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_ssl_by_cert.phpt
@@ -1,156 +1,164 @@
--TEST--
AMQPConnection - ssl support / authentication using certificates
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
<?php if (true) print "skip - run ssl connection test manually"; ?>
--FILE--
<?php
/*
openssl s_server -accept 8443 \
-cert /home/vagrant/php-amqp/provision/test_certs/server/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/server/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
openssl s_client -connect localhost:8443 \
-cert /home/vagrant/php-amqp/provision/test_certs/sasl-client/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/sasl-client/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
# to connect to rabbitmq server manually
openssl s_client -connect localhost:5671 \
-cert /home/vagrant/php-amqp/provision/test_certs/sasl-client/cert.pem \
-key /home/vagrant/php-amqp/provision/test_certs/sasl-client/key.pem \
-CAfile /home/vagrant/php-amqp/provision/test_certs/testca/cacert.pem
Certificate authentication needs the hostname to be as the certificate CN one:
e.g.: server CN = *.example.org
=> hostname must be in same domain
e.g. rabbitmq.example.org
if verify = true
=> you need a /etc/hosts entry, so that the server can resolve the name supplied by the client
127.0.0.1 rabbitmq.example.org rabbitmq
CN in client certificate must also match CN scheme
CN in server is *.example.org
CN in clients used are e.g.:
client.example.org
sasl-client.example.org
users have to exist with appropriate rights in rabbitmq
you can validate authentication by looking at /var/log/rabbitmq/rabbit@vagrant-sasl.log
connection <0.1104.0> (127.0.0.1:48898 -> 127.0.0.1:5671): user 'sasl-client.example.org' authenticated and granted access to vhost '/'
*/
$credentials = array(
'host' => 'rabbitmq.example.org',
'port' => 5671,
'verify' => true,
'cacert' => __DIR__ . "/../provision/test_certs/testca/cacert.pem",
'cert' => __DIR__ . "/../provision/test_certs/sasl-client/cert.pem",
'key' => __DIR__ . "/../provision/test_certs/sasl-client/key.pem",
'sasl_method' => 1
);
$cnn = new AMQPConnection($credentials);
$cnn->setSaslMethod(1);
var_dump($cnn);
$cnn->connect();
echo ($cnn->isConnected() ? 'connected' : 'disconnected'), PHP_EOL;
echo PHP_EOL;
$cnn = new AMQPConnection();
$cnn->setHost('localhost');
$cnn->setPort(5671);
$cnn->setCACert(__DIR__ . "/../provision/test_certs/testca/cacert.pem");
$cnn->setCert(__DIR__ . "/../provision/test_certs/sasl-client/cert.pem");
$cnn->setKey(__DIR__ . "/../provision/test_certs/sasl-client/key.pem");
$cnn->setSaslMethod(1);
$cnn->setVerify(true);
var_dump($cnn);
try {
$cnn->connect();
} catch(Exception $e) {
echo get_class($e), "({$e->getCode()}): ", $e->getMessage(), PHP_EOL;
}
echo ($cnn->isConnected() ? 'connected' : 'disconnected'), PHP_EOL;
//sleep(100);
?>
--EXPECTF--
-object(AMQPConnection)#1 (16) {
+object(AMQPConnection)#1 (18) {
["login":"AMQPConnection":private]=>
string(5) "guest"
["password":"AMQPConnection":private]=>
string(5) "guest"
["host":"AMQPConnection":private]=>
string(20) "rabbitmq.example.org"
["vhost":"AMQPConnection":private]=>
string(1) "/"
["port":"AMQPConnection":private]=>
int(5671)
["read_timeout":"AMQPConnection":private]=>
float(0)
["write_timeout":"AMQPConnection":private]=>
float(0)
["connect_timeout":"AMQPConnection":private]=>
float(0)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/testca/cacert.pem"
["key":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/sasl-client/key.pem"
["cert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/sasl-client/cert.pem"
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(1)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
connected
-object(AMQPConnection)#2 (16) {
+object(AMQPConnection)#2 (18) {
["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(5671)
["read_timeout":"AMQPConnection":private]=>
float(0)
["write_timeout":"AMQPConnection":private]=>
float(0)
["connect_timeout":"AMQPConnection":private]=>
float(0)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/testca/cacert.pem"
["key":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/sasl-client/key.pem"
["cert":"AMQPConnection":private]=>
string(%d) "%s/provision/test_certs/sasl-client/cert.pem"
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(1)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
AMQPConnectionException(0): Socket error: could not connect to host.
disconnected
diff --git a/amqp-1.9.4/tests/amqpconnection_toomanychannels.phpt b/amqp-1.10.2/tests/amqpconnection_toomanychannels.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpconnection_toomanychannels.phpt
rename to amqp-1.10.2/tests/amqpconnection_toomanychannels.phpt
diff --git a/amqp-1.9.4/tests/amqpconnection_var_dump.phpt b/amqp-1.10.2/tests/amqpconnection_var_dump.phpt
similarity index 88%
rename from amqp-1.9.4/tests/amqpconnection_var_dump.phpt
rename to amqp-1.10.2/tests/amqpconnection_var_dump.phpt
index 310ca77..0871c11 100644
--- a/amqp-1.9.4/tests/amqpconnection_var_dump.phpt
+++ b/amqp-1.10.2/tests/amqpconnection_var_dump.phpt
@@ -1,130 +1,142 @@
--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 (16) {
+object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
bool(true)
bool(true)
-object(AMQPConnection)#1 (16) {
+object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
bool(false)
-object(AMQPConnection)#1 (16) {
+object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
diff --git a/amqp-1.9.4/tests/amqpdecimal.phpt b/amqp-1.10.2/tests/amqpdecimal.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpdecimal.phpt
rename to amqp-1.10.2/tests/amqpdecimal.phpt
diff --git a/amqp-1.9.4/tests/amqpenvelope_construct.phpt b/amqp-1.10.2/tests/amqpenvelope_construct.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpenvelope_construct.phpt
rename to amqp-1.10.2/tests/amqpenvelope_construct.phpt
diff --git a/amqp-1.9.4/tests/amqpenvelope_get_accessors.phpt b/amqp-1.10.2/tests/amqpenvelope_get_accessors.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpenvelope_get_accessors.phpt
rename to amqp-1.10.2/tests/amqpenvelope_get_accessors.phpt
diff --git a/amqp-1.9.4/tests/amqpenvelope_var_dump.phpt b/amqp-1.10.2/tests/amqpenvelope_var_dump.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpenvelope_var_dump.phpt
rename to amqp-1.10.2/tests/amqpenvelope_var_dump.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange-declare-segfault.phpt b/amqp-1.10.2/tests/amqpexchange-declare-segfault.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange-declare-segfault.phpt
rename to amqp-1.10.2/tests/amqpexchange-declare-segfault.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_attributes.phpt b/amqp-1.10.2/tests/amqpexchange_attributes.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_attributes.phpt
rename to amqp-1.10.2/tests/amqpexchange_attributes.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_bind.phpt b/amqp-1.10.2/tests/amqpexchange_bind.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_bind.phpt
rename to amqp-1.10.2/tests/amqpexchange_bind.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_bind_with_arguments.phpt b/amqp-1.10.2/tests/amqpexchange_bind_with_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_bind_with_arguments.phpt
rename to amqp-1.10.2/tests/amqpexchange_bind_with_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_bind_without_key.phpt b/amqp-1.10.2/tests/amqpexchange_bind_without_key.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_bind_without_key.phpt
rename to amqp-1.10.2/tests/amqpexchange_bind_without_key.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_bind_without_key_with_arguments.phpt b/amqp-1.10.2/tests/amqpexchange_bind_without_key_with_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_bind_without_key_with_arguments.phpt
rename to amqp-1.10.2/tests/amqpexchange_bind_without_key_with_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_channel_refcount.phpt b/amqp-1.10.2/tests/amqpexchange_channel_refcount.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_channel_refcount.phpt
rename to amqp-1.10.2/tests/amqpexchange_channel_refcount.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_construct_basic.phpt b/amqp-1.10.2/tests/amqpexchange_construct_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_construct_basic.phpt
rename to amqp-1.10.2/tests/amqpexchange_construct_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_declare_basic.phpt b/amqp-1.10.2/tests/amqpexchange_declare_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_declare_basic.phpt
rename to amqp-1.10.2/tests/amqpexchange_declare_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_declare_existent.phpt b/amqp-1.10.2/tests/amqpexchange_declare_existent.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_declare_existent.phpt
rename to amqp-1.10.2/tests/amqpexchange_declare_existent.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_declare_with_stalled_reference.phpt b/amqp-1.10.2/tests/amqpexchange_declare_with_stalled_reference.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_declare_with_stalled_reference.phpt
rename to amqp-1.10.2/tests/amqpexchange_declare_with_stalled_reference.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_declare_without_name.phpt b/amqp-1.10.2/tests/amqpexchange_declare_without_name.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_declare_without_name.phpt
rename to amqp-1.10.2/tests/amqpexchange_declare_without_name.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_declare_without_type.phpt b/amqp-1.10.2/tests/amqpexchange_declare_without_type.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_declare_without_type.phpt
rename to amqp-1.10.2/tests/amqpexchange_declare_without_type.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_delete_default_exchange.phpt b/amqp-1.10.2/tests/amqpexchange_delete_default_exchange.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_delete_default_exchange.phpt
rename to amqp-1.10.2/tests/amqpexchange_delete_default_exchange.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_get_channel.phpt b/amqp-1.10.2/tests/amqpexchange_get_channel.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_get_channel.phpt
rename to amqp-1.10.2/tests/amqpexchange_get_channel.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_get_connection.phpt b/amqp-1.10.2/tests/amqpexchange_get_connection.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_get_connection.phpt
rename to amqp-1.10.2/tests/amqpexchange_get_connection.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_invalid_type.phpt b/amqp-1.10.2/tests/amqpexchange_invalid_type.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_invalid_type.phpt
rename to amqp-1.10.2/tests/amqpexchange_invalid_type.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_basic.phpt b/amqp-1.10.2/tests/amqpexchange_publish_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_basic.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_confirms.phpt b/amqp-1.10.2/tests/amqpexchange_publish_confirms.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_confirms.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_confirms.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_confirms_consume.phpt b/amqp-1.10.2/tests/amqpexchange_publish_confirms_consume.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_confirms_consume.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_confirms_consume.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_empty_routing_key.phpt b/amqp-1.10.2/tests/amqpexchange_publish_empty_routing_key.phpt
similarity index 100%
copy from amqp-1.9.4/tests/amqpexchange_publish_empty_routing_key.phpt
copy to amqp-1.10.2/tests/amqpexchange_publish_empty_routing_key.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_mandatory.phpt b/amqp-1.10.2/tests/amqpexchange_publish_mandatory.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_mandatory.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_mandatory.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_mandatory_consume.phpt b/amqp-1.10.2/tests/amqpexchange_publish_mandatory_consume.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_mandatory_consume.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_mandatory_consume.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_mandatory_multiple_channels_pitfal.phpt b/amqp-1.10.2/tests/amqpexchange_publish_mandatory_multiple_channels_pitfal.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_mandatory_multiple_channels_pitfal.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_mandatory_multiple_channels_pitfal.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_empty_routing_key.phpt b/amqp-1.10.2/tests/amqpexchange_publish_null_routing_key.phpt
similarity index 77%
rename from amqp-1.9.4/tests/amqpexchange_publish_empty_routing_key.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_null_routing_key.phpt
index bab006f..43cc1f0 100644
--- a/amqp-1.9.4/tests/amqpexchange_publish_empty_routing_key.phpt
+++ b/amqp-1.10.2/tests/amqpexchange_publish_null_routing_key.phpt
@@ -1,20 +1,20 @@
--TEST--
-AMQPExchange publish with empty routing key
+AMQPExchange publish with null routing key
--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();
-echo $ex->publish('message') ? 'true' : 'false';
+echo $ex->publish('message', null) ? 'true' : 'false';
$ex->delete();
?>
--EXPECT--
true
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_decimal_header.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_decimal_header.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_decimal_header.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_decimal_header.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_null.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_null.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_null.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_null.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_properties.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_properties.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_properties.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_properties.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_properties_ignore_num_header.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_properties_ignore_unsupported_header_values.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_properties_nested_header.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_properties_nested_header.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_properties_nested_header.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_properties_nested_header.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_properties_user_id_failure.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_properties_user_id_failure.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_with_timestamp_header.phpt b/amqp-1.10.2/tests/amqpexchange_publish_with_timestamp_header.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_with_timestamp_header.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_with_timestamp_header.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_publish_xdeath.phpt b/amqp-1.10.2/tests/amqpexchange_publish_xdeath.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_publish_xdeath.phpt
rename to amqp-1.10.2/tests/amqpexchange_publish_xdeath.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_setArgument.phpt b/amqp-1.10.2/tests/amqpexchange_setArgument.phpt
similarity index 87%
rename from amqp-1.9.4/tests/amqpexchange_setArgument.phpt
rename to amqp-1.10.2/tests/amqpexchange_setArgument.phpt
index a5eebca..486e16b 100644
--- a/amqp-1.9.4/tests/amqpexchange_setArgument.phpt
+++ b/amqp-1.10.2/tests/amqpexchange_setArgument.phpt
@@ -1,353 +1,389 @@
--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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"]=>
int(100000)
}
}
object(AMQPExchange)#4 (9) {
["connection":"AMQPExchange":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"]=>
int(100000)
}
}
diff --git a/amqp-1.9.4/tests/amqpexchange_set_flag.phpt b/amqp-1.10.2/tests/amqpexchange_set_flag.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_set_flag.phpt
rename to amqp-1.10.2/tests/amqpexchange_set_flag.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_set_flags.phpt b/amqp-1.10.2/tests/amqpexchange_set_flags.phpt
similarity index 87%
rename from amqp-1.9.4/tests/amqpexchange_set_flags.phpt
rename to amqp-1.10.2/tests/amqpexchange_set_flags.phpt
index c053bc4..4034987 100644
--- a/amqp-1.9.4/tests/amqpexchange_set_flags.phpt
+++ b/amqp-1.10.2/tests/amqpexchange_set_flags.phpt
@@ -1,121 +1,133 @@
--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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"
}
}
diff --git a/amqp-1.9.4/tests/amqpexchange_unbind.phpt b/amqp-1.10.2/tests/amqpexchange_unbind.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_unbind.phpt
rename to amqp-1.10.2/tests/amqpexchange_unbind.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_unbind_with_arguments.phpt b/amqp-1.10.2/tests/amqpexchange_unbind_with_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_unbind_with_arguments.phpt
rename to amqp-1.10.2/tests/amqpexchange_unbind_with_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_unbind_without_key.phpt b/amqp-1.10.2/tests/amqpexchange_unbind_without_key.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_unbind_without_key.phpt
rename to amqp-1.10.2/tests/amqpexchange_unbind_without_key.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_unbind_without_key_with_arguments.phpt b/amqp-1.10.2/tests/amqpexchange_unbind_without_key_with_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpexchange_unbind_without_key_with_arguments.phpt
rename to amqp-1.10.2/tests/amqpexchange_unbind_without_key_with_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpexchange_var_dump.phpt b/amqp-1.10.2/tests/amqpexchange_var_dump.phpt
similarity index 86%
rename from amqp-1.9.4/tests/amqpexchange_var_dump.phpt
rename to amqp-1.10.2/tests/amqpexchange_var_dump.phpt
index a4956e2..e1249b2 100644
--- a/amqp-1.9.4/tests/amqpexchange_var_dump.phpt
+++ b/amqp-1.10.2/tests/amqpexchange_var_dump.phpt
@@ -1,217 +1,241 @@
--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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPExchange":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"
}
}
diff --git a/amqp-1.9.4/tests/amqpqueue-cancel-no-consumers.phpt b/amqp-1.10.2/tests/amqpqueue-cancel-no-consumers.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue-cancel-no-consumers.phpt
rename to amqp-1.10.2/tests/amqpqueue-cancel-no-consumers.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_attributes.phpt b/amqp-1.10.2/tests/amqpqueue_attributes.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_attributes.phpt
rename to amqp-1.10.2/tests/amqpqueue_attributes.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_bind_basic.phpt b/amqp-1.10.2/tests/amqpqueue_bind_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_bind_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_bind_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_bind_basic_empty_routing_key.phpt b/amqp-1.10.2/tests/amqpqueue_bind_basic_empty_routing_key.phpt
similarity index 100%
copy from amqp-1.9.4/tests/amqpqueue_bind_basic_empty_routing_key.phpt
copy to amqp-1.10.2/tests/amqpqueue_bind_basic_empty_routing_key.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_bind_basic_headers_arguments.phpt b/amqp-1.10.2/tests/amqpqueue_bind_basic_headers_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_bind_basic_headers_arguments.phpt
rename to amqp-1.10.2/tests/amqpqueue_bind_basic_headers_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_bind_basic_empty_routing_key.phpt b/amqp-1.10.2/tests/amqpqueue_bind_null_routing_key.phpt
similarity index 87%
rename from amqp-1.9.4/tests/amqpqueue_bind_basic_empty_routing_key.phpt
rename to amqp-1.10.2/tests/amqpqueue_bind_null_routing_key.phpt
index 21fc244..758f384 100644
--- a/amqp-1.9.4/tests/amqpqueue_bind_basic_empty_routing_key.phpt
+++ b/amqp-1.10.2/tests/amqpqueue_bind_null_routing_key.phpt
@@ -1,26 +1,26 @@
--TEST--
AMQPQueue
--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()));
+echo $queue->bind($ex->getName(), null) ? 'true' : 'false';
$queue->delete();
$ex->delete();
?>
--EXPECT--
-bool(true)
+true
diff --git a/amqp-1.9.4/tests/amqpqueue_cancel.phpt b/amqp-1.10.2/tests/amqpqueue_cancel.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_cancel.phpt
rename to amqp-1.10.2/tests/amqpqueue_cancel.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_construct_basic.phpt b/amqp-1.10.2/tests/amqpqueue_construct_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_construct_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_construct_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_consume_basic.phpt b/amqp-1.10.2/tests/amqpqueue_consume_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_consume_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_consume_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_consume_multiple.phpt b/amqp-1.10.2/tests/amqpqueue_consume_multiple.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_consume_multiple.phpt
rename to amqp-1.10.2/tests/amqpqueue_consume_multiple.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_consume_multiple_no_doubles.phpt b/amqp-1.10.2/tests/amqpqueue_consume_multiple_no_doubles.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_consume_multiple_no_doubles.phpt
rename to amqp-1.10.2/tests/amqpqueue_consume_multiple_no_doubles.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_consume_nonexistent.phpt b/amqp-1.10.2/tests/amqpqueue_consume_nonexistent.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_consume_nonexistent.phpt
rename to amqp-1.10.2/tests/amqpqueue_consume_nonexistent.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_consume_timeout.phpt b/amqp-1.10.2/tests/amqpqueue_consume_timeout.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_consume_timeout.phpt
rename to amqp-1.10.2/tests/amqpqueue_consume_timeout.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_declare_basic.phpt b/amqp-1.10.2/tests/amqpqueue_declare_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_declare_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_declare_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_declare_with_arguments.phpt b/amqp-1.10.2/tests/amqpqueue_declare_with_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_declare_with_arguments.phpt
rename to amqp-1.10.2/tests/amqpqueue_declare_with_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_declare_with_stalled_reference.phpt b/amqp-1.10.2/tests/amqpqueue_declare_with_stalled_reference.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_declare_with_stalled_reference.phpt
rename to amqp-1.10.2/tests/amqpqueue_declare_with_stalled_reference.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_delete_basic.phpt b/amqp-1.10.2/tests/amqpqueue_delete_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_delete_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_delete_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_empty_name.phpt b/amqp-1.10.2/tests/amqpqueue_empty_name.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_empty_name.phpt
rename to amqp-1.10.2/tests/amqpqueue_empty_name.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_basic.phpt b/amqp-1.10.2/tests/amqpqueue_get_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_channel.phpt b/amqp-1.10.2/tests/amqpqueue_get_channel.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_channel.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_channel.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_connection.phpt b/amqp-1.10.2/tests/amqpqueue_get_connection.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_connection.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_connection.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_empty_body.phpt b/amqp-1.10.2/tests/amqpqueue_get_empty_body.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_empty_body.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_empty_body.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_headers.phpt b/amqp-1.10.2/tests/amqpqueue_get_headers.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_headers.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_headers.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_get_nonexistent.phpt b/amqp-1.10.2/tests/amqpqueue_get_nonexistent.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_get_nonexistent.phpt
rename to amqp-1.10.2/tests/amqpqueue_get_nonexistent.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_headers_with_bool.phpt b/amqp-1.10.2/tests/amqpqueue_headers_with_bool.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_headers_with_bool.phpt
rename to amqp-1.10.2/tests/amqpqueue_headers_with_bool.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_headers_with_float.phpt b/amqp-1.10.2/tests/amqpqueue_headers_with_float.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_headers_with_float.phpt
rename to amqp-1.10.2/tests/amqpqueue_headers_with_float.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_headers_with_null.phpt b/amqp-1.10.2/tests/amqpqueue_headers_with_null.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_headers_with_null.phpt
rename to amqp-1.10.2/tests/amqpqueue_headers_with_null.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_nack.phpt b/amqp-1.10.2/tests/amqpqueue_nack.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_nack.phpt
rename to amqp-1.10.2/tests/amqpqueue_nack.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_nested_arrays.phpt b/amqp-1.10.2/tests/amqpqueue_nested_arrays.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_nested_arrays.phpt
rename to amqp-1.10.2/tests/amqpqueue_nested_arrays.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_nested_headers.phpt b/amqp-1.10.2/tests/amqpqueue_nested_headers.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_nested_headers.phpt
rename to amqp-1.10.2/tests/amqpqueue_nested_headers.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_purge_basic.phpt b/amqp-1.10.2/tests/amqpqueue_purge_basic.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_purge_basic.phpt
rename to amqp-1.10.2/tests/amqpqueue_purge_basic.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_setArgument.phpt b/amqp-1.10.2/tests/amqpqueue_setArgument.phpt
similarity index 86%
rename from amqp-1.9.4/tests/amqpqueue_setArgument.phpt
rename to amqp-1.10.2/tests/amqpqueue_setArgument.phpt
index f461e23..1ffc3c5 100644
--- a/amqp-1.9.4/tests/amqpqueue_setArgument.phpt
+++ b/amqp-1.10.2/tests/amqpqueue_setArgument.phpt
@@ -1,339 +1,375 @@
--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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPQueue":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPQueue":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"]=>
int(100000)
}
}
object(AMQPQueue)#4 (9) {
["connection":"AMQPQueue":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPQueue":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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"]=>
int(100000)
}
}
diff --git a/amqp-1.9.4/tests/amqpqueue_unbind_basic_empty_routing_key.phpt b/amqp-1.10.2/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
rename to amqp-1.10.2/tests/amqpqueue_unbind_basic_empty_routing_key.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_unbind_basic_headers_arguments.phpt b/amqp-1.10.2/tests/amqpqueue_unbind_basic_headers_arguments.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqpqueue_unbind_basic_headers_arguments.phpt
rename to amqp-1.10.2/tests/amqpqueue_unbind_basic_headers_arguments.phpt
diff --git a/amqp-1.9.4/tests/amqpqueue_var_dump.phpt b/amqp-1.10.2/tests/amqpqueue_var_dump.phpt
similarity index 86%
rename from amqp-1.9.4/tests/amqpqueue_var_dump.phpt
rename to amqp-1.10.2/tests/amqpqueue_var_dump.phpt
index d14eaca..29d428a 100644
--- a/amqp-1.9.4/tests/amqpqueue_var_dump.phpt
+++ b/amqp-1.10.2/tests/amqpqueue_var_dump.phpt
@@ -1,121 +1,133 @@
--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 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["channel":"AMQPQueue":private]=>
- object(AMQPChannel)#2 (4) {
+ object(AMQPChannel)#2 (6) {
["connection":"AMQPChannel":private]=>
- object(AMQPConnection)#1 (16) {
+ object(AMQPConnection)#1 (18) {
["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)
+ ["rpc_timeout":"AMQPConnection":private]=>
+ float(0)
["channel_max":"AMQPConnection":private]=>
int(256)
["frame_max":"AMQPConnection":private]=>
int(131072)
["heartbeat":"AMQPConnection":private]=>
int(0)
["cacert":"AMQPConnection":private]=>
string(0) ""
["key":"AMQPConnection":private]=>
string(0) ""
["cert":"AMQPConnection":private]=>
string(0) ""
["verify":"AMQPConnection":private]=>
bool(true)
["sasl_method":"AMQPConnection":private]=>
int(0)
+ ["connection_name":"AMQPConnection":private]=>
+ NULL
}
["prefetch_count":"AMQPChannel":private]=>
int(3)
["prefetch_size":"AMQPChannel":private]=>
int(0)
+ ["global_prefetch_count":"AMQPChannel":private]=>
+ int(0)
+ ["global_prefetch_size":"AMQPChannel":private]=>
+ int(0)
["consumers":"AMQPChannel":private]=>
array(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) {
}
}
diff --git a/amqp-1.9.4/tests/amqptimestamp.phpt b/amqp-1.10.2/tests/amqptimestamp.phpt
similarity index 100%
rename from amqp-1.9.4/tests/amqptimestamp.phpt
rename to amqp-1.10.2/tests/amqptimestamp.phpt
diff --git a/amqp-1.9.4/tests/bug_17831.phpt b/amqp-1.10.2/tests/bug_17831.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_17831.phpt
rename to amqp-1.10.2/tests/bug_17831.phpt
diff --git a/amqp-1.9.4/tests/bug_19707.phpt b/amqp-1.10.2/tests/bug_19707.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_19707.phpt
rename to amqp-1.10.2/tests/bug_19707.phpt
diff --git a/amqp-1.9.4/tests/bug_19840.phpt b/amqp-1.10.2/tests/bug_19840.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_19840.phpt
rename to amqp-1.10.2/tests/bug_19840.phpt
diff --git a/amqp-1.9.4/tests/bug_61533.phpt b/amqp-1.10.2/tests/bug_61533.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_61533.phpt
rename to amqp-1.10.2/tests/bug_61533.phpt
diff --git a/amqp-1.9.4/tests/bug_62354.phpt b/amqp-1.10.2/tests/bug_62354.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_62354.phpt
rename to amqp-1.10.2/tests/bug_62354.phpt
diff --git a/amqp-1.9.4/tests/bug_gh147.phpt b/amqp-1.10.2/tests/bug_gh147.phpt
similarity index 52%
rename from amqp-1.9.4/tests/bug_gh147.phpt
rename to amqp-1.10.2/tests/bug_gh147.phpt
index 53527c6..d463ed9 100644
--- a/amqp-1.9.4/tests/bug_gh147.phpt
+++ b/amqp-1.10.2/tests/bug_gh147.phpt
@@ -1,44 +1,60 @@
--TEST--
#147 Segfault when catchable fatal error happens in consumer
--SKIPIF--
<?php if (!extension_loaded("amqp")) print "skip"; ?>
--FILE--
<?php
+
+// Register error handler to be able to catch the error
+// as it's not catchable with try/catch before PHP 7.4
+// see https://github.com/php/php-src/pull/3887
+function exception_error_handler($severity, $message, $file, $line) {
+ echo $message;
+ exit;
+}
+set_error_handler("exception_error_handler");
+
$time = microtime(true);
$connection = new AMQPConnection();
$connection->connect();
$channel = new AMQPChannel($connection);
$channel->setPrefetchCount(2);
$exchange = new AMQPExchange($channel);
$exchange->setType(AMQP_EX_TYPE_TOPIC);
$exchange->setName('test_' . $time);
$exchange->setFlags(AMQP_AUTODELETE);
$exchange->declareExchange();
$queue = new AMQPQueue($channel);
$queue->setName('test_' . $time);
$queue->declareQueue();
$queue->bind($exchange->getName(), 'test');
$exchange->publish('test message', 'test');
-echo 'start', PHP_EOL;
-$queue->consume(function(AMQPEnvelope $e) use (&$consume) {
- echo 'consuming';
- $e . 'should fail';
+echo 'start'.PHP_EOL;
+try {
+ $queue->consume(function(AMQPEnvelope $e) use (&$consume) {
+ echo 'consuming'.PHP_EOL;
+ $e . 'should fail';
- return false;
-});
+ return false;
+ });
+} catch (Throwable $ex) {
+ // Exception is only thrown as of PHP 7.4
+ echo $ex->getMessage();
+ exit;
+}
echo 'done', PHP_EOL;
?>
--EXPECTF--
start
consuming
-%s fatal error: Object of class %s could not be converted to string in %s on line %d
\ No newline at end of file
+Object of class %s could not be converted to string
\ No newline at end of file
diff --git a/amqp-1.9.4/tests/bug_gh155_direct_reply_to.phpt b/amqp-1.10.2/tests/bug_gh155_direct_reply_to.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh155_direct_reply_to.phpt
rename to amqp-1.10.2/tests/bug_gh155_direct_reply_to.phpt
diff --git a/amqp-1.9.4/tests/bug_gh50-1.phpt b/amqp-1.10.2/tests/bug_gh50-1.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh50-1.phpt
rename to amqp-1.10.2/tests/bug_gh50-1.phpt
diff --git a/amqp-1.9.4/tests/bug_gh50-2.phpt b/amqp-1.10.2/tests/bug_gh50-2.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh50-2.phpt
rename to amqp-1.10.2/tests/bug_gh50-2.phpt
diff --git a/amqp-1.9.4/tests/bug_gh50-3.phpt b/amqp-1.10.2/tests/bug_gh50-3.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh50-3.phpt
rename to amqp-1.10.2/tests/bug_gh50-3.phpt
diff --git a/amqp-1.9.4/tests/bug_gh50-4.phpt b/amqp-1.10.2/tests/bug_gh50-4.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh50-4.phpt
rename to amqp-1.10.2/tests/bug_gh50-4.phpt
diff --git a/amqp-1.9.4/tests/bug_gh53-2.phpt b/amqp-1.10.2/tests/bug_gh53-2.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh53-2.phpt
rename to amqp-1.10.2/tests/bug_gh53-2.phpt
diff --git a/amqp-1.9.4/tests/bug_gh53.phpt b/amqp-1.10.2/tests/bug_gh53.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh53.phpt
rename to amqp-1.10.2/tests/bug_gh53.phpt
diff --git a/amqp-1.9.4/tests/bug_gh72-1.phpt b/amqp-1.10.2/tests/bug_gh72-1.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh72-1.phpt
rename to amqp-1.10.2/tests/bug_gh72-1.phpt
diff --git a/amqp-1.9.4/tests/bug_gh72-2.phpt b/amqp-1.10.2/tests/bug_gh72-2.phpt
similarity index 100%
rename from amqp-1.9.4/tests/bug_gh72-2.phpt
rename to amqp-1.10.2/tests/bug_gh72-2.phpt
diff --git a/amqp-1.9.4/tests/package-version.phpt b/amqp-1.10.2/tests/package-version.phpt
similarity index 100%
rename from amqp-1.9.4/tests/package-version.phpt
rename to amqp-1.10.2/tests/package-version.phpt
diff --git a/package.xml b/package.xml
index 60b26f9..c8ad230 100644
--- a/package.xml
+++ b/package.xml
@@ -1,1001 +1,1090 @@
<?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">
+<package packagerversion="1.10.9" 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>
<developer>
<name>Bogdan Padalko</name>
<user>pinepain</user>
<email>pinepain@gmail.com</email>
<active>yes</active>
</developer>
- <date>2019-01-02</date>
- <time>13:40:56</time>
+ <date>2020-04-05</date>
+ <time>15:40:43</time>
<version>
- <release>1.9.4</release>
- <api>1.3.0</api>
+ <release>1.10.2</release>
+ <api>1.10.2</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
-* Improved build environment (Olivier Dolbeau)
-* Various bug fixes and improvements (Bogdan Padalko, yjqg6666)
-* Support for PHP 7.3 (Remi Collet)
+- Windows build: avoid variable lengths arrays (Christoph M. Becker) (https://github.com/pdezwart/php-amqp/issues/368)
For a complete list of changes see:
-https://github.com/pdezwart/php-amqp/compare/v1.9.3...v1.9.4
+https://github.com/pdezwart/php-amqp/compare/v1.10.1...v1.10.2
</notes>
<contents>
<dir name="/">
- <file md5sum="f778f775b116d30be66dfb8bd0844f90" name="config.m4" role="src" />
+ <file md5sum="617d97bb91ac9ece8a6c35e55bd439dc" name="config.m4" role="src" />
<file md5sum="d4ad59768110240c333a4c524ab88a81" 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="f8ef6a7350254c5a524e7e23365b20a2" name="amqp.c" role="src" />
- <file md5sum="7babdcf410d57e3da9c4a5b32e2a4a36" name="amqp_basic_properties.c" role="src" />
+ <file md5sum="faaa7130786487ae7bfda8adaeea93c2" name="tests/_test_helpers.php.inc" role="test" />
+ <file md5sum="810c10aa7daa8a1a70893fa071967ec6" name="amqp.c" role="src" />
+ <file md5sum="744ed050f98ab3b46cd7b0462881ae46" name="amqp_basic_properties.c" role="src" />
<file md5sum="c62dc325454cd341dfe7b36b6ba4fccb" name="amqp_basic_properties.h" role="src" />
- <file md5sum="0350fc0114efe56bfbd60aa08edbc7a6" name="amqp_channel.c" role="src" />
+ <file md5sum="56142ea6a604c662d17dabdf6eddfff4" name="amqp_channel.c" role="src" />
<file md5sum="8704617230ce35a136b7f7a57568100f" name="amqp_channel.h" role="src" />
- <file md5sum="c1e9294c71fe7d9fb3d1ac4b24ce84af" name="amqp_connection.c" role="src" />
+ <file md5sum="ee8b5aa55e5813ad414b49fa06e7f1b3" name="amqp_connection.c" role="src" />
<file md5sum="ecd982518fffc49e5e6ceaf9c3136193" name="amqp_connection.h" role="src" />
- <file md5sum="087d7e76d26b5c7ecb165d5c8907c9d7" name="amqp_connection_resource.c" role="src" />
- <file md5sum="446ea2341129fcf585a21f0bab5bf7d5" name="amqp_connection_resource.h" role="src" />
+ <file md5sum="46a537f14a6423c77a39dfc9e50383c2" name="amqp_connection_resource.c" role="src" />
+ <file md5sum="fdd30d2acb2d3a0226bc5060265cdc6b" name="amqp_connection_resource.h" role="src" />
<file md5sum="5f6c903b0d9c84fc3cffd7476747d2eb" name="amqp_decimal.c" role="src" />
<file md5sum="072342fa335efef478f07d10e5da3212" name="amqp_decimal.h" role="src" />
<file md5sum="20d11c4e56d3878e3b94be59bd9e6d35" name="amqp_envelope.c" role="src" />
<file md5sum="64bb5307ac2b4b4cdf3f799d776b4089" name="amqp_envelope.h" role="src" />
- <file md5sum="7a415129f2834ae76ffb83d7c99244d1" name="amqp_exchange.c" role="src" />
+ <file md5sum="0c5eeb8c4a0b37452a54ee77b818f62c" name="amqp_exchange.c" role="src" />
<file md5sum="f2c00069fd753dba21897dd8c3a0cb03" name="amqp_exchange.h" role="src" />
<file md5sum="1b8aba38e995306c05de4ded00fe0abf" name="amqp_methods_handling.c" role="src" />
<file md5sum="5ffc6d80e7e5c3006e71dccc79fef131" name="amqp_methods_handling.h" role="src" />
- <file md5sum="830264c3470bb8b9b294fb32d6c1101e" name="amqp_queue.c" role="src" />
+ <file md5sum="6efddd5974255e27260e335ec3613bfb" name="amqp_queue.c" role="src" />
<file md5sum="7405fbf5defd24497f1e0a2163b0dffc" name="amqp_queue.h" role="src" />
<file md5sum="470b4e3558aee9eca7c6bfd355bb12c2" name="amqp_timestamp.c" role="src" />
<file md5sum="3117b944bd36604827dbba0e41b718b8" name="amqp_timestamp.h" role="src" />
- <file md5sum="171ca95312d330a2bb7b17d8362987da" name="amqp_type.c" role="src" />
+ <file md5sum="752d71db72a6edf7f925a71617d21c9c" name="amqp_type.c" role="src" />
<file md5sum="7888a972689144a7b9a11952ffc522a7" name="amqp_type.h" role="src" />
- <file md5sum="efff34069e7da203f93c7ed9865fa6e1" name="php5_support.h" role="src" />
- <file md5sum="9833597acdb7ea5b4b3307142792c545" name="php7_support.h" role="src" />
- <file md5sum="3d150e72e12f4ce2c1bf2f0cc8ed76a3" name="php_amqp.h" role="src" />
+ <file md5sum="b0e991164b76323761b316a1f72b5f26" name="php5_support.h" role="src" />
+ <file md5sum="20e29c41041096050c4ca6cef167938e" name="php7_support.h" role="src" />
+ <file md5sum="8956489ba22b56ee3d0c004abda97a45" name="php_amqp.h" role="src" />
<file md5sum="64f3ee6a3fb11c06920520b030a28dc5" name="tests/003-channel-consumers.phpt" role="test" />
<file md5sum="e88b1fab5b26f2bb131189916c8ceb09" name="tests/004-queue-consume-nested.phpt" role="test" />
<file md5sum="be58c4897e42d2df45545c3b5f092bdb" name="tests/004-queue-consume-orphaned.phpt" role="test" />
- <file md5sum="faaa7130786487ae7bfda8adaeea93c2" name="tests/_test_helpers.php.inc" role="test" />
<file md5sum="fa50fadb23d82d41863cbb92cbaf71f5" name="tests/amqpbasicproperties.phpt" role="test" />
<file md5sum="842b5bbde94da2bb8fbd8282ae72bd71" name="tests/amqpchannel_basicRecover.phpt" role="test" />
<file md5sum="a873d20f9c3814c1f5b5c39571044349" name="tests/amqpchannel_close.phpt" role="test" />
<file md5sum="2a4b8d7fa70e9994056aea6990ee67fb" name="tests/amqpchannel_confirmSelect.phpt" role="test" />
<file md5sum="804eb9007733180f4300197288e7cd30" name="tests/amqpchannel_construct_basic.phpt" role="test" />
+ <file md5sum="ae1ca639aaa9347ce72ab2fef176bc3b" name="tests/amqpchannel_construct_ini_global_prefetch_count.phpt" role="test" />
+ <file md5sum="0332b077bc45ca7b3039b42989892846" name="tests/amqpchannel_construct_ini_global_prefetch_size.phpt" role="test" />
+ <file md5sum="6f5a3baa85bce3f6b5cf1f5d315bd809" name="tests/amqpchannel_construct_ini_prefetch_count.phpt" role="test" />
+ <file md5sum="b58d30d5095c8022ec0efb39f3963b79" name="tests/amqpchannel_construct_ini_prefetch_size.phpt" role="test" />
<file md5sum="fbb15ebdf594756a61ff250318fbecbc" name="tests/amqpchannel_getChannelId.phpt" role="test" />
<file md5sum="9c9cc955cdfd88e9824613aa90cc07aa" name="tests/amqpchannel_get_connection.phpt" role="test" />
<file md5sum="8df78eedf3254e35401bb04b5f921e45" name="tests/amqpchannel_multi_channel_connection.phpt" role="test" />
+ <file md5sum="a0aca81e1fbbd1cb516ce7a7e4350d49" name="tests/amqpchannel_set_global_prefetch_count.phpt" role="test" />
+ <file md5sum="1c4d20c0c7180f5d7465f050b9387992" name="tests/amqpchannel_set_global_prefetch_size.phpt" role="test" />
+ <file md5sum="68c7190ad1d74031204105e4e4d2d74a" name="tests/amqpchannel_set_prefetch_and_global_prefetch_count.phpt" role="test" />
+ <file md5sum="28698fb3a46cde64d7a684a022902773" name="tests/amqpchannel_set_prefetch_and_global_prefetch_size.phpt" role="test" />
+ <file md5sum="1aa01da3a1c61ba55e0dcbd05eb93901" name="tests/amqpchannel_set_prefetch_count.phpt" role="test" />
+ <file md5sum="c31ba2f590526599c59963079cb47064" name="tests/amqpchannel_set_prefetch_size.phpt" role="test" />
<file md5sum="7ed3240775603a7ddbf37e6876e61e45" name="tests/amqpchannel_slots_usage.phpt" role="test" />
- <file md5sum="eb5945344939d0a2ffb00175dfdd175b" name="tests/amqpchannel_var_dump.phpt" role="test" />
+ <file md5sum="b76fa868d39ae8516c2a246fe82356bf" name="tests/amqpchannel_var_dump.phpt" role="test" />
<file md5sum="f6a5540e9da042896e012d907f52dfa7" name="tests/amqpconnection_connect_login_failure.phpt" role="test" />
<file md5sum="ab671ce4cfeefa0f77caca47fc3926b5" name="tests/amqpconnection_connection_getters.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="16b42ece32d4a043b5796fbb47b21dd4" name="tests/amqpconnection_construct_params_by_value.phpt" role="test" />
<file md5sum="f851af4db4ff8b90ea80cb9bc395cee5" name="tests/amqpconnection_construct_with_connect_timeout.phpt" role="test" />
- <file md5sum="142e8ebb89848f1eb791d0935a56b3b6" name="tests/amqpconnection_construct_with_limits.phpt" role="test" />
+ <file md5sum="89469fdd01030ce19f1102fa31b034db" name="tests/amqpconnection_construct_with_connection_name.phpt" role="test" />
+ <file md5sum="df0f793fdaf1f85c7a64c8258bc774e7" name="tests/amqpconnection_construct_with_limits.phpt" role="test" />
+ <file md5sum="187c989459718667d75aff70e64c78a1" name="tests/amqpconnection_construct_with_rpc_timeout.phpt" role="test" />
<file md5sum="ae036274132482eb5662da360a6af391" name="tests/amqpconnection_construct_with_timeout.phpt" role="test" />
<file md5sum="0b5526b800bc605338584d214e05b5e1" 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="6552721460fb599402ea900878b494e7" name="tests/amqpconnection_heartbeat.phpt" role="test" />
- <file md5sum="0762a8f286766265c729f0d9b96938c6" name="tests/amqpconnection_heartbeat_with_consumer.phpt" role="test" />
+ <file md5sum="b1abededd7ed066e78faf1ea52f30a52" name="tests/amqpconnection_heartbeat_with_consumer.phpt" role="test" />
<file md5sum="3165d8aef946f0a0b540596e905d9156" name="tests/amqpconnection_heartbeat_with_persistent.phpt" role="test" />
<file md5sum="9e7f8576ff71311929ecae5119712906" name="tests/amqpconnection_persistent_construct_basic.phpt" role="test" />
<file md5sum="39287e41d546cdeb329df6e6e3284f3d" name="tests/amqpconnection_persistent_in_use.phpt" role="test" />
<file md5sum="cad266168a54c7b9aeddfe85c6f647b5" name="tests/amqpconnection_persistent_reusable.phpt" role="test" />
+ <file md5sum="dd7e1e7e144fd0f0591164f1b2695fc2" name="tests/amqpconnection_setConnectionName.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="98c04e50c1f828a1dbac1f5615a29895" name="tests/amqpconnection_setPort_int.phpt" role="test" />
+ <file md5sum="98d376b3f3aa4aa207f8b240d77b26dd" 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="a216a2a1852827fda23254c62fbfcdbf" 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="99ecda165646b9f76249d2fba8098f36" name="tests/amqpconnection_setRpcTimeout_float.phpt" role="test" />
+ <file md5sum="a0f3e1b031db44b5a4e6f2e486e3dd72" name="tests/amqpconnection_setRpcTimeout_int.phpt" role="test" />
+ <file md5sum="498372d4ddffd977d28afcd3b751cb4e" name="tests/amqpconnection_setRpcTimeout_out_of_range.phpt" role="test" />
+ <file md5sum="b3049fa5bf5b79208fcb347f829e16a2" name="tests/amqpconnection_setRpcTimeout_string.phpt" role="test" />
<file md5sum="b678c01da10f5a656d0acde18c8d8dd7" name="tests/amqpconnection_setSaslMethod.phpt" role="test" />
<file md5sum="1be9dba493c92e498178a5bde9cb60c6" name="tests/amqpconnection_setSaslMethod_invalid.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="cd03ddad9f24a2d9a9207b8e62039c0f" name="tests/amqpconnection_ssl.phpt" role="test" />
- <file md5sum="4369306baaed3e9d0f81d8a9a45d7d79" name="tests/amqpconnection_ssl_by_cert.phpt" role="test" />
+ <file md5sum="2bacf379958511cfd11cc4f17a21b4b5" name="tests/amqpconnection_ssl.phpt" role="test" />
+ <file md5sum="d1892908f8e0c6423c7d60e1405e4f4b" name="tests/amqpconnection_ssl_by_cert.phpt" role="test" />
<file md5sum="dac615c869f608dbdc3dbc8587a5ab9a" name="tests/amqpconnection_toomanychannels.phpt" role="test" />
- <file md5sum="ae98176e847b11e4ebc0fb76acb3bf5e" name="tests/amqpconnection_var_dump.phpt" role="test" />
+ <file md5sum="d53b45a2d636d05049de833761c4e65c" name="tests/amqpconnection_var_dump.phpt" role="test" />
<file md5sum="5536de7c295245e0d3bc2f34a3f38042" name="tests/amqpdecimal.phpt" role="test" />
<file md5sum="7ced91fd8a3642b582b6707a114f2781" name="tests/amqpenvelope_construct.phpt" role="test" />
<file md5sum="d8e2c1d3887ea0558beaab8e138d301a" name="tests/amqpenvelope_get_accessors.phpt" role="test" />
<file md5sum="e39997d486928b8376ff8e28b780fe19" name="tests/amqpenvelope_var_dump.phpt" role="test" />
<file md5sum="91af58e35f198c72f72ef8cc445382f1" name="tests/amqpexchange-declare-segfault.phpt" role="test" />
<file md5sum="0f6e538a4abb44d9bde6af8fc9481e19" 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="c115bd162f6f76851a1ef4a6b045dbc1" name="tests/amqpexchange_declare_existent.phpt" role="test" />
<file md5sum="ef9c53add89f1e46d24a6b5041074b2c" name="tests/amqpexchange_declare_with_stalled_reference.phpt" role="test" />
<file md5sum="1c5013b561e7ebcf6e3b2826a0738c45" name="tests/amqpexchange_declare_without_name.phpt" role="test" />
<file md5sum="80850d20bcc03e6d7f02a816aa1c28b5" name="tests/amqpexchange_declare_without_type.phpt" role="test" />
<file md5sum="ac55043263ef12570a12b7c48258d009" name="tests/amqpexchange_delete_default_exchange.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="e068267152373a4c5792f2bf0092027e" name="tests/amqpexchange_invalid_type.phpt" role="test" />
<file md5sum="28d40d0147069b95f19370dabcc05d51" name="tests/amqpexchange_publish_basic.phpt" role="test" />
<file md5sum="81bb89bbdfd54f29dbcf868ecfa6dd97" name="tests/amqpexchange_publish_confirms.phpt" role="test" />
<file md5sum="f97c7f50efe1b13b9f4d11f0265d0c7c" name="tests/amqpexchange_publish_confirms_consume.phpt" role="test" />
<file md5sum="4d07c2070b00e062b8dbeb3ba47e7423" name="tests/amqpexchange_publish_empty_routing_key.phpt" role="test" />
<file md5sum="d836193e09dbbb284048eb4fbd61dd25" name="tests/amqpexchange_publish_mandatory.phpt" role="test" />
<file md5sum="89ffdeaaa535c8f0f1fbabd6b0eb034d" name="tests/amqpexchange_publish_mandatory_consume.phpt" role="test" />
<file md5sum="da6b0eef46a24f63f24fdade2e9c1545" name="tests/amqpexchange_publish_mandatory_multiple_channels_pitfal.phpt" role="test" />
+ <file md5sum="c4ead55cb776dc2066aa595a53e56ba1" name="tests/amqpexchange_publish_null_routing_key.phpt" role="test" />
<file md5sum="17d9f63c34080e1c67c7a61e31a7e77d" name="tests/amqpexchange_publish_with_decimal_header.phpt" role="test" />
<file md5sum="22b69d2bfab58d6d710ee796c04a91fd" name="tests/amqpexchange_publish_with_null.phpt" role="test" />
<file md5sum="84c314cfd6ea0ef9dc009f5824cb127b" 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="5b78840065355c5d66fda97ccb3e320a" 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="f412c35e04d632d9f1ecf57efb195bfd" name="tests/amqpexchange_publish_with_properties_user_id_failure.phpt" role="test" />
<file md5sum="e85263c667bd3d8a82542955772e97db" name="tests/amqpexchange_publish_with_timestamp_header.phpt" role="test" />
<file md5sum="cc4b29eeaa0cd39dd2565cceff087e58" name="tests/amqpexchange_publish_xdeath.phpt" role="test" />
- <file md5sum="a2870e35480fe1fd4baf948db5b58b75" name="tests/amqpexchange_setArgument.phpt" role="test" />
+ <file md5sum="792e11e40dae0632e0f28a67af2760fa" name="tests/amqpexchange_setArgument.phpt" role="test" />
<file md5sum="6692eef7a0bb10e53ef74e1809e3dd85" name="tests/amqpexchange_set_flag.phpt" role="test" />
- <file md5sum="4b12dbdd56b81f6869ef0d789c1eeee5" name="tests/amqpexchange_set_flags.phpt" role="test" />
+ <file md5sum="1db912ef7d281b281ec7d1334a6596e9" 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="58a7e39a6072ae9e0da48c58d4d7370e" name="tests/amqpexchange_var_dump.phpt" role="test" />
+ <file md5sum="55be069e66c2e7ca27275f9b92dbfb3f" name="tests/amqpexchange_var_dump.phpt" role="test" />
<file md5sum="61bf37d8356eb2114711a2054548057f" name="tests/amqpqueue-cancel-no-consumers.phpt" role="test" />
<file md5sum="bcfdc6784ec35990525a1cf5db1c4539" 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="5b4550cc92ba1548ea330885de588119" name="tests/amqpqueue_bind_null_routing_key.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="614b245bed2c133c457a171a0d2d8ac2" name="tests/amqpqueue_consume_basic.phpt" role="test" />
<file md5sum="3f37c89263cb9207ba8adbfb9333c0ab" name="tests/amqpqueue_consume_multiple.phpt" role="test" />
<file md5sum="5e36e341a8797edeee72397d8adcb7bb" name="tests/amqpqueue_consume_multiple_no_doubles.phpt" role="test" />
<file md5sum="ce3b8a87a7098e28ecd53e315e7f5b71" name="tests/amqpqueue_consume_nonexistent.phpt" role="test" />
<file md5sum="ae666872e458783556c67fe6abdd794f" 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="0cd41fc43328676bc9a2f3148e3d37ae" name="tests/amqpqueue_declare_with_stalled_reference.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="cdef0cd7f6143b2d25e2812eb2a6e0cd" 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="fc8f622409a0cc39b6ee2bb040e39da8" name="tests/amqpqueue_get_nonexistent.phpt" role="test" />
<file md5sum="e5e91148bef1c93af8428c8315364998" name="tests/amqpqueue_headers_with_bool.phpt" role="test" />
<file md5sum="0148833c3e17e9a206d3006b72654ca7" name="tests/amqpqueue_headers_with_float.phpt" role="test" />
<file md5sum="2c786082311c24bbee0ebc5e75cea843" name="tests/amqpqueue_headers_with_null.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="df42a25a266fd070630d7ad28ba3c06e" name="tests/amqpqueue_nested_headers.phpt" role="test" />
<file md5sum="abaf080a5feab914919e8bcf837e9d83" name="tests/amqpqueue_purge_basic.phpt" role="test" />
- <file md5sum="57223ec0f1f7ac867cca6cc9ff7d0d2f" name="tests/amqpqueue_setArgument.phpt" role="test" />
+ <file md5sum="1e71595f5b1cdac62810b451049d540e" 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="8ff08103449f68beacfc76d1d9bfdf5a" name="tests/amqpqueue_var_dump.phpt" role="test" />
+ <file md5sum="b2047471e12a76d165b68f2c833843cd" name="tests/amqpqueue_var_dump.phpt" role="test" />
<file md5sum="522735b54c65f14c9793c1f979964f81" name="tests/amqptimestamp.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="189e780725cd8e3f0308446545b48c35" name="tests/bug_19840.phpt" role="test" />
<file md5sum="7d494f04d735f7934831ed515336181f" name="tests/bug_61533.phpt" role="test" />
<file md5sum="70c4b1222072be9591ff0f2d6bd4a0c9" name="tests/bug_62354.phpt" role="test" />
- <file md5sum="8dd0f6b63737787108527ae2f77bc6f0" name="tests/bug_gh147.phpt" role="test" />
+ <file md5sum="2bf3015dcb817d60a38632a6f6e8c108" name="tests/bug_gh147.phpt" role="test" />
<file md5sum="6157e371b447ebf125b36340ebbac39c" name="tests/bug_gh155_direct_reply_to.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="e70de43b7962d958d88e248dbf277e34" name="tests/bug_gh53.phpt" role="test" />
<file md5sum="d8de8918a3c73ebdcb4159581ea58b5f" name="tests/bug_gh72-1.phpt" role="test" />
<file md5sum="4f74239a15b2aae85b498f947d294e3c" name="tests/bug_gh72-2.phpt" role="test" />
<file md5sum="212e44c003f3b950b3f85958fdc5a367" name="tests/package-version.phpt" role="test" />
<file md5sum="8e198d3d7222a6863b8b247c67a97eed" name="stubs/AMQP.php" role="doc" />
<file md5sum="a22f310ae4901dbcdc577b2fcce6d7cd" name="stubs/AMQPBasicProperties.php" role="doc" />
- <file md5sum="dcd6a589870731ce551d32dc135b7dbd" name="stubs/AMQPChannel.php" role="doc" />
+ <file md5sum="b59b0d15499960b9054f0d20076d861a" name="stubs/AMQPChannel.php" role="doc" />
<file md5sum="d79254277f60751c4ba6697333af5d37" name="stubs/AMQPChannelException.php" role="doc" />
- <file md5sum="56bbe556b1586a82d2098d3f28d454e7" name="stubs/AMQPConnection.php" role="doc" />
+ <file md5sum="17befba781aedac83fbdf023263c68bf" name="stubs/AMQPConnection.php" role="doc" />
<file md5sum="da1cd6ac1b51f2433904ce770e6f4ca3" name="stubs/AMQPConnectionException.php" role="doc" />
<file md5sum="c21e96e7fb7412a6fabf52f62441701a" name="stubs/AMQPDecimal.php" role="doc" />
<file md5sum="fd33d84a1eb37f238141068c642a0aec" name="stubs/AMQPEnvelope.php" role="doc" />
<file md5sum="477fc70c91bdae22a5375326abc8b5ed" name="stubs/AMQPEnvelopeException.php" role="doc" />
<file md5sum="0b9b43b817a884d311f8f8013d8a5adc" name="stubs/AMQPException.php" role="doc" />
<file md5sum="4ba4a62fd5debb2453390e1a4da7d325" name="stubs/AMQPExchange.php" role="doc" />
<file md5sum="7d1035c7a2b82f9187b10f05fe882eed" name="stubs/AMQPExchangeException.php" role="doc" />
<file md5sum="498b4f8e6e8ca26c0b3fdc51d7663d92" name="stubs/AMQPQueue.php" role="doc" />
<file md5sum="d7da0562e86197fc6bb0d12af0a25495" name="stubs/AMQPQueueException.php" role="doc" />
<file md5sum="0d1f0359883d316344c4f8a2a53add0e" name="stubs/AMQPTimestamp.php" role="doc" />
<file md5sum="c9e20d2df7f8b831276bf49e1d33da47" name="stubs/AMQPValueException.php" role="doc" />
</dir>
</contents>
<dependencies>
<required>
<php>
- <min>5.3.0</min>
+ <min>5.6.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>
+ <date>2020-04-05</date>
+ <time>16:04:23</time>
+ <version>
+ <release>1.10.1</release>
+ <api>1.10.1</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP License</license>
+ <notes>
+- Fix Windows compatibility: avoid variable lengths arrays (Christoph M. Becker &lt;cmbecker69@gmx.de&gt;) (https://github.com/pdezwart/php-amqp/issues/368)
+
+For a complete list of changes see:
+https://github.com/pdezwart/php-amqp/compare/v1.10.0...v1.10.1
+ </notes>
+ </release>
+ <release>
+ <date>2020-04-03</date>
+ <time>19:17:00</time>
+ <version>
+ <release>1.10.0</release>
+ <api>1.3.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP License</license>
+ <notes>
+- Adding global prefetch support (#366) (Terence Marks &lt;tezmarks@gmail.com&gt;) (https://github.com/pdezwart/php-amqp/issues/367)
+- Fix minimal librabbitmq in config.m4 and readme (Remi Collet &lt;remi@remirepo.net&gt;) (https://github.com/pdezwart/php-amqp/issues/347)
+- Support connection_name parameter for custom connection names in RabbitMQ (Alexandr Zolotukhin &lt;supersmile2009@gmail.com&gt;) (https://github.com/pdezwart/php-amqp/issues/363)
+- Fixed build on Travis CI (Alexandr Zolotukhin &lt;supersmile2009@gmail.com&gt;) (https://github.com/pdezwart/php-amqp/issues/365)
+- Make use of rpc_timeout in newer librabbitmq by introducing new constructor hash parameter (modulatix &lt;oleg.pereverzev@gmail.com&gt;) (https://github.com/pdezwart/php-amqp/issues/334)
+- Fix #355: Compile failure on php 7.4 (Christoph M. Becker &lt;cmbecker69@gmx.de&gt;) (https://github.com/pdezwart/php-amqp/issues/359)
+- Update amqp_type.c (Paweł Mikołajczuk &lt;pawel@mikolajczuk.in&gt;) (https://github.com/pdezwart/php-amqp/issues/360)
+- Build against PHP 7.4 (Carlos Barrero &lt;carlos.barrero@spotahome.com&gt;) (https://github.com/pdezwart/php-amqp/issues/361)
+- Pass params by value in AMQPConnection::__construct() (Sergei Karpov) (https://github.com/pdezwart/php-amqp/issues/346)
+- Fix explicit null-string for $routing_key in Queue::bind() and Exchange::publish() (Sergei Karpov) (https://github.com/pdezwart/php-amqp/issues/341)
+- No longer limited to PHP 5 (Lars Strojny &lt;lars.strojny@internations.org&gt;) (https://github.com/pdezwart/php-amqp/issues/0)
+- Fix minimal version to 5.6 (Remi Collet &lt;remi@famillecollet.com&gt;) (https://github.com/pdezwart/php-amqp/issues/338)
+- Back to dev (Lars Strojny &lt;lars.strojny@internations.org&gt;) (https://github.com/pdezwart/php-amqp/issues/1)
+
+For a complete list of changes see:
+https://github.com/pdezwart/php-amqp/compare/v1.9.4...v1.10.0
+ </notes>
+ </release>
+ <release>
+ <date>2017-10-19</date>
+ <time>16:00:00</time>
+ <version>
+ <release>1.9.4</release>
+ <api>1.3.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP License</license>
+ <notes>
+* Improved build environment (Olivier Dolbeau)
+* Various bug fixes and improvements (Bogdan Padalko, yjqg6666)
+* Support for PHP 7.3 (Remi Collet)
+
+For a complete list of changes see:
+https://github.com/pdezwart/php-amqp/compare/v1.9.3...v1.9.4
+ </notes>
+ </release>
<release>
<date>2017-10-19</date>
<time>16:00:00</time>
<version>
<release>1.9.3</release>
<api>1.3.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Fix handling channel consumers (#284) (Bogdan Padalko)
* Add support for consumer tags (#282) (Bogdan Padalko)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.9.1...v1.9.3
</notes>
</release>
<release>
<version>
<release>1.9.1</release>
<api>1.3.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Separate queue and exchange args to prevent segfault with opcache enabled (Bogdan Padalko)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.9.0...v1.9.1
</notes>
</release>
<release>
<version>
<release>1.9.0</release>
<api>1.3.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* AMQP types are now better supported through value objects (see #271, #269, #265) (Bogdan Padalko, Lars Strojny)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.8.0...v1.9.0
</notes>
</release>
<release>
<version>
<release>1.9.0beta2</release>
<api>1.3.0</api>
</version>
<stability>
<release>beta</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* AMQP types are now better supported through value objects (see #271, #269, #265) (Bogdan Padalko, Lars Strojny)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.8.0...v1.9.0beta2
</notes>
</release>
<release>
<version>
<release>1.9.0beta1</release>
<api>1.3.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* AMQP types are now better supported through value objects (see #271, #269, #265) (Bogdan Padalko, Lars Strojny)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.8.0...v1.9.0beta1
</notes>
</release>
<release>
<version>
<release>1.8.0</release>
<api>1.2.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Add SSL connection support (Bogdan Padalko)
* Support for server method handling: confirms (publisher acknowledgments) and basic.return (Bogdan Padalko)
* Add support for pkg-config (Remi Collet)
* Preserve AMQP server error code for exceptions (Bogdan Padalko)
* Add AMQPChannel::close() (Bogdan Padalko)
* Fix segfault when deleting an unknown exchange (Bogdan Padalko)
* Fix segfault with PHPUnit and xdebug for PHP 7 (Bogdan Padalko)
* Add publisher confirms (Bogdan Padalko)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.7.1...v1.8.0
</notes>
</release>
<release>
<version>
<release>1.8.0beta2</release>
<api>1.2.0</api>
</version>
<stability>
<release>beta</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Add SSL connection support (Bogdan Padalko)
* Support for server method handling: confirms (publisher acknowledgments) and basic.return (Bogdan Padalko)
* Add support for pkg-config (Remi Collet)
* Preserve AMQP server error code for exceptions (Bogdan Padalko)
* Add AMQPChannel::close() (Bogdan Padalko)
* Fix segfault when deleting an unknown exchange (Bogdan Padalko)
* Fix segfault with PHPUnit and xdebug for PHP 7 (Bogdan Padalko)
* Add publisher confirms (Bogdan Padalko)
* Fix 1.8.0 release (Lars Strojny)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.7.1...v1.8.0beta2
</notes>
</release>
<release>
<version>
<release>1.7.1</release>
<api>1.0.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Add support for pkg-config (Remi Collet)
* Fixed wrongful truncation of amqp.password to the length of amqp.login (https://github.com/skobkars)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.7.0...v1.7.1
</notes>
</release>
<release>
<version>
<release>1.7.0</release>
<api>1.0.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Add PHP7 support (Bogdan Padalko, Steffen Hanikel)
* Add AMQPEnvelope::hasHeader(), AMQPExchange::hasArgument() and AMQPQueue::hasArgument() to check whether specific header exists (Bogdan Padalko)
* Fix AMQPConnection::setPort() writes to wrong property (Bogdan Padalko)
* Add compiled librabbitmq version early check (Bogdan Padalko)
* Fix segfault when channel zval type != IS_OBJECT (Bogdan Padalko)
* Fix API breakage when rabbitmq-c &lt; 0.6.0 used (Bogdan Padalko)
* Close connection on library errors (Bogdan Padalko)
* Do not store connection resource ID string (Bogdan Padalko)
* Explicitly cleanup references on connection on cleanup (Bogdan Padalko)
* Show effective connection values when connection is active and passed values otherwise (Bogdad 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)
* Upgrade vagrant box to Ubuntu 15.10 Wily Werwof (Bogdan Padalko)
* Fix various grammar and spelling mistakes (Artem Gordinsky)
* Update stubs (Sascha-Oliver Prolic)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.6.0...v1.7.0
</notes>
</release>
<release>
<version>
<release>1.7.0alpha2</release>
<api>1.0.0</api>
</version>
<stability>
<release>beta</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* Fix AMQPConnection::setPort() writes to wrong property (Bogdan Padalko)
* Upgrade vagrant box to Ubuntu 15.10 Wily Werwof (Bogdan Padalko)
For a complete list of changes see:
https://github.com/pdezwart/php-amqp/compare/v1.7.0alpha1...v1.7.0alpha2
</notes>
</release>
<release>
<version>
<release>1.7.0alpha1</release>
<api>1.0.0</api>
</version>
<stability>
<release>beta</release>
<api>stable</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
* 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>
</release>
<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 &gt;= 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
</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
* Add support for nested arguments values (Bogdan Padalko)
* Add auto_delete and internal flags support for AMQPExchange::declare (librabbitmq version &gt; 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 &gt; 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.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.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 &gt;= 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-&gt;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-&gt;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
* 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 &apos;connect&apos; 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&apos;t compile pecl extension under PHP 5.3
* 17831: Segmentation fault when the exchange doesn&apos;t exists
* 19707: AMQPQueue::get() doesn&apos;t return the message
* 19840: Connection Exception
</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
Thu, Sep 11, 7:21 PM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42710
Default Alt Text
(513 KB)

Event Timeline