Release 1.0.2 tag

release_1_0_2
Pierrick Charron 2010-08-13 13:56:29 +00:00
parent cc688cd647
commit cff698477e
3 changed files with 10 additions and 15 deletions

View File

@ -12,11 +12,12 @@ This extension allows php applications to communicate with any Stomp compliant M
<email>pierrick@php.net</email>
<active>yes</active>
</lead>
<date>xxxx-xx-xx</date>
<version><release>1.x.x</release><api>1.x.x</api></version>
<date>2010-08-13</date>
<version><release>1.0.2</release><api>1.0.2</api></version>
<stability><release>stable</release><api>stable</api></stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Fixed SSL connection bug introduced in 1.0.1
</notes>
<contents>

View File

@ -31,8 +31,8 @@ typedef struct _stomp_object {
#define PHP_STOMP_EXTNAME "Stomp"
#define PHP_STOMP_MAJOR_VERSION "1"
#define PHP_STOMP_MINOR_VERSION "0"
#define PHP_STOMP_PATCH_VERSION "1"
#define PHP_STOMP_VERSION_STATUS "-dev"
#define PHP_STOMP_PATCH_VERSION "2"
#define PHP_STOMP_VERSION_STATUS ""
#define PHP_STOMP_VERSION PHP_STOMP_MAJOR_VERSION "." PHP_STOMP_MINOR_VERSION "." PHP_STOMP_PATCH_VERSION PHP_STOMP_VERSION_STATUS
#define PHP_STOMP_RES_NAME "stomp connection"

16
stomp.c
View File

@ -294,17 +294,7 @@ int stomp_send(stomp_t *stomp, stomp_frame_t *frame TSRMLS_DC)
*/
int stomp_recv(stomp_t *stomp, char *msg, size_t length)
{
int n, len;
n = php_pollfd_for_ms(stomp->fd, PHP_POLLREADABLE, stomp->options.read_timeout_sec * 1000 + stomp->options.read_timeout_usec);
if (n < 1) {
#if !defined(PHP_WIN32) && !(defined(NETWARE) && defined(USE_WINSOCK))
if (n == 0) {
errno = ETIMEDOUT;
}
#endif
return -1;
}
int len;
#if HAVE_STOMP_SSL
if(stomp->options.use_ssl) {
@ -460,6 +450,10 @@ stomp_frame_t *stomp_read_frame(stomp_t *stomp)
char *cmd = NULL, *length_str = NULL;
int length = 0;
if (!stomp_select(stomp)) {
return NULL;
}
INIT_STOMP_FRAME(f);
if (NULL == f) {