Modified: pecl/stomp/trunk/php_stomp.c
===================================================================
--- pecl/stomp/trunk/php_stomp.c	2009-11-03 23:56:07 UTC (rev 290194)
+++ pecl/stomp/trunk/php_stomp.c	2009-11-04 01:36:17 UTC (rev 290195)
@@ -131,10 +131,12 @@
 ZEND_BEGIN_ARG_INFO_EX(stomp_transaction_args, 0, 0, 2)
 ZEND_ARG_INFO(0, link)
 ZEND_ARG_INFO(0, transaction_id)
+ZEND_ARG_ARRAY_INFO(0, properties, 1)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(stomp_oop_transaction_args, 0, 0, 1)
 ZEND_ARG_INFO(0, transaction_id)
+ZEND_ARG_ARRAY_INFO(0, properties, 1)
 ZEND_END_ARG_INFO()

 ZEND_BEGIN_ARG_INFO_EX(stomp_ack_args, 0, 0, 2)
@@ -148,16 +150,22 @@
 ZEND_ARG_ARRAY_INFO(0, properties, 1)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(stomp_set_timeout_args, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(stomp_set_read_timeout_args, 0, 0, 2)
 ZEND_ARG_INFO(0, link)
 ZEND_ARG_INFO(0, seconds)
 ZEND_ARG_INFO(0, microseconds)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(stomp_oop_set_timeout_args, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(stomp_oop_set_read_timeout_args, 0, 0, 1)
 ZEND_ARG_INFO(0, seconds)
 ZEND_ARG_INFO(0, microseconds)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(stomp_frame_construct_args, 0, 0, 0)
+ZEND_ARG_INFO(0, command)
+ZEND_ARG_ARRAY_INFO(0, headers, 1)
+ZEND_ARG_INFO(0, body)
+ZEND_END_ARG_INFO()
 /* }}} */

 /* {{{ stomp_functions */
@@ -176,8 +184,8 @@
     PHP_FE(stomp_abort,             stomp_transaction_args)
     PHP_FE(stomp_ack,               stomp_ack_args)
     PHP_FE(stomp_error,             stomp_link_only)
-    PHP_FE(stomp_set_timeout,       stomp_set_timeout_args)
-    PHP_FE(stomp_get_timeout,       stomp_link_only)
+    PHP_FE(stomp_set_read_timeout,  stomp_set_read_timeout_args)
+    PHP_FE(stomp_get_read_timeout,  stomp_link_only)
     {NULL, NULL, NULL}
 };
 /* }}} */
@@ -197,15 +205,15 @@
     PHP_FALIAS(abort,           stomp_abort,             stomp_oop_transaction_args)
     PHP_FALIAS(ack,             stomp_ack,               stomp_oop_ack_args)
     PHP_FALIAS(error,           stomp_error,             stomp_no_args)
-    PHP_FALIAS(setTimeout,      stomp_set_timeout,       stomp_oop_set_timeout_args)
-    PHP_FALIAS(getTimeout,      stomp_get_timeout,       stomp_no_args)
+    PHP_FALIAS(setReadTimeout,  stomp_set_read_timeout,  stomp_oop_set_read_timeout_args)
+    PHP_FALIAS(getReadTimeout,  stomp_get_read_timeout,  stomp_no_args)
     {NULL, NULL, NULL}
 };
 /* }}} */

 /* {{{ stomp_frame_methods[] */
 static zend_function_entry stomp_frame_methods[] = {
-    PHP_ME(stompframe, __construct, NULL, ZEND_ACC_PUBLIC)
+    PHP_ME(stompframe, __construct, stomp_frame_construct_args, ZEND_ACC_PUBLIC)
     {NULL, NULL, NULL}
 };
 /* }}} */
@@ -235,16 +243,20 @@

 PHP_INI_BEGIN()
 STD_PHP_INI_ENTRY("stomp.default_broker", "tcp://localhost:61613", PHP_INI_ALL, OnUpdateString, default_broker, zend_stomp_globals, stomp_globals)
-STD_PHP_INI_ENTRY("stomp.default_timeout_sec", "2", PHP_INI_ALL, OnUpdateLong, timeout_sec, zend_stomp_globals, stomp_globals)
-STD_PHP_INI_ENTRY("stomp.default_timeout_usec", "0", PHP_INI_ALL, OnUpdateLong, timeout_usec, zend_stomp_globals, stomp_globals)
+STD_PHP_INI_ENTRY("stomp.default_read_timeout_sec", "2", PHP_INI_ALL, OnUpdateLong, read_timeout_sec, zend_stomp_globals, stomp_globals)
+STD_PHP_INI_ENTRY("stomp.default_read_timeout_usec", "0", PHP_INI_ALL, OnUpdateLong, read_timeout_usec, zend_stomp_globals, stomp_globals)
+STD_PHP_INI_ENTRY("stomp.default_connection_timeout_sec", "2", PHP_INI_ALL, OnUpdateLong, connection_timeout_sec, zend_stomp_globals, stomp_globals)
+STD_PHP_INI_ENTRY("stomp.default_connection_timeout_usec", "0", PHP_INI_ALL, OnUpdateLong, connection_timeout_usec, zend_stomp_globals, stomp_globals)
 PHP_INI_END()

 /* {{{ PHP_GINIT_FUNCTION */
 static PHP_GINIT_FUNCTION(stomp)
 {
     stomp_globals->default_broker = NULL;
-    stomp_globals->timeout_sec = 2;
-    stomp_globals->timeout_usec = 0;
+    stomp_globals->read_timeout_sec = 2;
+    stomp_globals->read_timeout_usec = 0;
+    stomp_globals->connection_timeout_sec = 2;
+    stomp_globals->connection_timeout_usec = 0;
 }
 /* }}} */

@@ -416,7 +428,7 @@
         }
     }

-    stomp = stomp_new(url_parts->host, url_parts->port ? url_parts->port : 61613, STOMP_G(timeout_sec), STOMP_G(timeout_usec) TSRMLS_CC);
+    stomp = stomp_new(url_parts->host, url_parts->port ? url_parts->port : 61613, STOMP_G(read_timeout_sec), STOMP_G(read_timeout_usec) TSRMLS_CC);
     php_url_free(url_parts);

 #if HAVE_STOMP_SSL
@@ -807,16 +819,17 @@
     int transaction_id_length = 0;
     stomp_frame_t frame = {0};
     int success = 0;
+    zval *properties = NULL;

     if (stomp_object) {
         stomp_object_t *i_obj = NULL;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &transaction_id, &transaction_id_length) == FAILURE) {
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a", &transaction_id, &transaction_id_length, &properties) == FAILURE) {
             return;
         }
         FETCH_STOMP_OBJECT;
     } else {
         zval *arg = NULL;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|s", &arg, &transaction_id, &transaction_id_length) == FAILURE) {
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|a", &arg, &transaction_id, &transaction_id_length, &properties) == FAILURE) {
             return;
         }
         ZEND_FETCH_RESOURCE(stomp, stomp_t *, &arg, -1, PHP_STOMP_RES_NAME, le_stomp);
@@ -828,6 +841,11 @@
         zend_hash_add(frame.headers, "transaction", sizeof("transaction"), transaction_id, transaction_id_length + 1, NULL);
     }

+    /* Translate a PHP array to a stomp_header array */
+    if (NULL != properties) {
+        FRAME_HEADER_FROM_HASHTABLE(frame.headers, Z_ARRVAL_P(properties));
+    }
+
     if (stomp_send(stomp, &frame TSRMLS_CC) > 0) {
         success = stomp_valid_receipt(stomp, &frame);
     }
@@ -938,7 +956,7 @@

 /* {{{ proto void Stomp::setTimeout(int seconds [, int microseconds])
    Set the timeout */
-PHP_FUNCTION(stomp_set_timeout)
+PHP_FUNCTION(stomp_set_read_timeout)
 {
     zval *stomp_object = getThis();
     stomp_t *stomp = NULL;
@@ -957,14 +975,14 @@
         ZEND_FETCH_RESOURCE(stomp, stomp_t *, &arg, -1, PHP_STOMP_RES_NAME, le_stomp);
     }

-    stomp->timeout_sec = sec;
-    stomp->timeout_usec = sec;
+    stomp->read_timeout_sec = sec;
+    stomp->read_timeout_usec = usec;
 }
 /* }}} */

 /* {{{ proto array Stomp::getTimeout()
    Get the timeout */
-PHP_FUNCTION(stomp_get_timeout)
+PHP_FUNCTION(stomp_get_read_timeout)
 {
     zval *stomp_object = getThis();
     stomp_t *stomp = NULL;
@@ -980,8 +998,8 @@
     }

     array_init(return_value);
-    add_assoc_long_ex(return_value, "sec", sizeof("sec"), stomp->timeout_sec);
-    add_assoc_long_ex(return_value, "usec", sizeof("usec"), stomp->timeout_usec);
+    add_assoc_long_ex(return_value, "sec", sizeof("sec"), stomp->read_timeout_sec);
+    add_assoc_long_ex(return_value, "usec", sizeof("usec"), stomp->read_timeout_usec);
 }
 /* }}} */


Modified: pecl/stomp/trunk/php_stomp.h
===================================================================
--- pecl/stomp/trunk/php_stomp.h	2009-11-03 23:56:07 UTC (rev 290194)
+++ pecl/stomp/trunk/php_stomp.h	2009-11-04 01:36:17 UTC (rev 290195)
@@ -30,7 +30,7 @@

 #define PHP_STOMP_EXTNAME                       "Stomp"
 #define PHP_STOMP_MAJOR_VERSION                 "0"
-#define PHP_STOMP_MINOR_VERSION                 "1"
+#define PHP_STOMP_MINOR_VERSION                 "3"
 #define PHP_STOMP_PATCH_VERSION                 "0"
 #define PHP_STOMP_VERSION                       PHP_STOMP_MAJOR_VERSION "." PHP_STOMP_MINOR_VERSION "." PHP_STOMP_PATCH_VERSION

@@ -79,15 +79,17 @@
 PHP_FUNCTION(stomp_abort);
 PHP_FUNCTION(stomp_ack);
 PHP_FUNCTION(stomp_error);
-PHP_FUNCTION(stomp_set_timeout);
-PHP_FUNCTION(stomp_get_timeout);
+PHP_FUNCTION(stomp_set_read_timeout);
+PHP_FUNCTION(stomp_get_read_timeout);

 PHP_METHOD(stompframe, __construct);

 ZEND_BEGIN_MODULE_GLOBALS(stomp)
     char *default_broker;
-    long timeout_sec;
-    long timeout_usec;
+    long read_timeout_sec;
+    long read_timeout_usec;
+    long connection_timeout_sec;
+    long connection_timeout_usec;
 ZEND_END_MODULE_GLOBALS(stomp)

 #ifdef ZTS

Modified: pecl/stomp/trunk/stomp.c
===================================================================
--- pecl/stomp/trunk/stomp.c	2009-11-03 23:56:07 UTC (rev 290194)
+++ pecl/stomp/trunk/stomp.c	2009-11-04 01:36:17 UTC (rev 290195)
@@ -29,9 +29,11 @@

 #define RETURN_READ_FRAME_FAIL { frame_destroy(f); return NULL; }

+ZEND_EXTERN_MODULE_GLOBALS(stomp);
+
 /* {{{ stomp_new
  */
-stomp_t *stomp_new(const char *host, unsigned short port, long timeout_sec, long timeout_usec TSRMLS_DC)
+stomp_t *stomp_new(const char *host, unsigned short port, long read_timeout_sec, long read_timeout_usec TSRMLS_DC)
 {
     /* Memory allocation for the stomp */
     stomp_t *stomp = (stomp_t *) emalloc(sizeof(stomp_t));
@@ -46,8 +48,8 @@
     stomp->status = 0;
     stomp->error = NULL;
     stomp->errnum = 0;
-    stomp->timeout_sec = timeout_sec;
-    stomp->timeout_usec = timeout_usec;
+    stomp->read_timeout_sec = read_timeout_sec;
+    stomp->read_timeout_usec = read_timeout_usec;
     stomp->session = NULL;

 #if HAVE_STOMP_SSL
@@ -82,8 +84,8 @@
     struct timeval tv;
     fd_set rfds;

-    tv.tv_sec = stomp->timeout_sec;
-    tv.tv_usec = stomp->timeout_usec;
+    tv.tv_sec = STOMP_G(connection_timeout_sec);
+    tv.tv_usec = STOMP_G(connection_timeout_usec);

     stomp->fd = php_network_connect_socket_to_host(stomp->host, stomp->port, SOCK_STREAM, 0, &tv, NULL, NULL, NULL, 0 TSRMLS_CC);
     if (stomp->fd == -1) {
@@ -144,10 +146,10 @@

 /* {{{ stomp_close
  */
-int stomp_close(stomp_t *stomp TSRMLS_DC)
+void stomp_close(stomp_t *stomp TSRMLS_DC)
 {
     if (NULL == stomp) {
-        return 1;
+        return;
     }

     if (stomp->fd != -1) {
@@ -169,7 +171,6 @@
     }

     efree(stomp);
-    return 1;
 }
 /* }}} */

@@ -221,11 +222,17 @@
 #ifdef HAVE_STOMP_SSL
     if (stomp->use_ssl) {
         if (-1 == SSL_write(stomp->ssl_handle, buf.c, buf.len) || -1 == SSL_write(stomp->ssl_handle, "\0\n", 2)) {
+            char error[1024];
+            snprintf(error, sizeof(error), "Unable to send data");
+            stomp_set_error(stomp, error, errno);
             return 0;
         }
     } else {
 #endif
         if (-1 == send(stomp->fd, buf.c, buf.len, 0) || -1 == send(stomp->fd, "\0\n", 2, 0)) {
+            char error[1024];
+            snprintf(error, sizeof(error), "Unable to send data");
+            stomp_set_error(stomp, error, errno);
             return 0;
         }
 #ifdef HAVE_STOMP_SSL
@@ -498,8 +505,8 @@
     struct timeval tv;
     fd_set rfds;

-    tv.tv_sec = stomp->timeout_sec;
-    tv.tv_usec = stomp->timeout_usec;
+    tv.tv_sec = stomp->read_timeout_sec;
+    tv.tv_usec = stomp->read_timeout_usec;

     FD_ZERO(&rfds);
     FD_SET(stomp->fd, &rfds);

Modified: pecl/stomp/trunk/stomp.h
===================================================================
--- pecl/stomp/trunk/stomp.h	2009-11-03 23:56:07 UTC (rev 290194)
+++ pecl/stomp/trunk/stomp.h	2009-11-04 01:36:17 UTC (rev 290195)
@@ -43,8 +43,8 @@
     int status;
     char *error;
     int errnum;
-    long timeout_sec;
-    long timeout_usec;
+    long read_timeout_sec;
+    long read_timeout_usec;
     char *session;
 #if HAVE_STOMP_SSL
     SSL *ssl_handle;
@@ -60,9 +60,9 @@
     int body_length;
 } stomp_frame_t;

-stomp_t *stomp_new(const char *host, unsigned short port, long timeout_sec, long timeout_usec TSRMLS_DC);
+stomp_t *stomp_new(const char *host, unsigned short port, long read_timeout_sec, long read_timeout_usec TSRMLS_DC);
 int stomp_connect(stomp_t *stomp TSRMLS_DC);
-int stomp_close(stomp_t *stomp TSRMLS_DC);
+void stomp_close(stomp_t *stomp TSRMLS_DC);
 int stomp_send(stomp_t *connection, stomp_frame_t *frame TSRMLS_DC);
 stomp_frame_t *stomp_read_frame(stomp_t *connection);
 int stomp_valid_receipt(stomp_t *connection, stomp_frame_t *frame);