Skip to content

Commit

Permalink
Merge pull request #22 from pubnub/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
vveljko authored Aug 3, 2017
2 parents c64dc36 + d1b9ed3 commit dc60e41
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 12 deletions.
6 changes: 5 additions & 1 deletion .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
name: c-core
version: 2.2.2
version: 2.2.4
scm: github.com/pubnub/c-core
changelog:
- version: v2.2.4
changes:
- type: bug
text: Fix off-by-one error
- version: v2.2.3
changes
- type: bug
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.3
2.2.4
7 changes: 3 additions & 4 deletions core/pubnub_coreapi_ex.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,16 @@ enum pubnub_res pubnub_publish_ex(pubnub_t *pb, const char *channel, const char

if (PUBNUB_CRYPTO_API && (NULL != opts.cipher_key)) {
pubnub_bymebl_t to_encrypt;
size_t n = PUBNUB_BUF_MAXLEN - 2;
size_t n = PUBNUB_BUF_MAXLEN - sizeof("\"\"");

to_encrypt.ptr = (uint8_t*)message;
to_encrypt.size = strlen(message);
encrypted_msg[0] = '"';
if (0 != pubnub_encrypt(opts.cipher_key, to_encrypt, encrypted_msg + 1, &n)) {
return PNR_INTERNAL_ERROR;
}
++n;
encrypted_msg[n++] = '"';
encrypted_msg[n] = '\0';
encrypted_msg[++n] = '"';
encrypted_msg[++n] = '\0';
message = encrypted_msg;
}

Expand Down
2 changes: 2 additions & 0 deletions core/pubnub_netcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ int pbnc_fsm(struct pubnub_ *pb)
break;
case PNR_OK:
if (strncmp(pb->core.http_buf, "HTTP/1.", 7) != 0) {
PUBNUB_LOG_ERROR("pb=%p bad HTTP response version: %.*s\n", pb, pbpal_read_len(pb), pb->core.http_buf);
outcome_detected(pb, PNR_IO_ERROR);
break;
}
Expand All @@ -505,6 +506,7 @@ int pbnc_fsm(struct pubnub_ *pb)
pb->state = PBS_RX_HEADERS;
goto next_state;
default:
PUBNUB_LOG_ERROR("pb=%p in PBS_RX_HTTP_VER: failure inducing pbpal_line_read_status %d\n", pb, pbrslt);
outcome_detected(pb, pbrslt);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion freertos/pubnub_version_freertos.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "pubnub_version.h"

#define PUBNUB_SDK_NAME "FreeRTOS"
#define PUBNUB_SDK_VERSION "2.2.3"
#define PUBNUB_SDK_VERSION "2.2.4"


char const *pubnub_sdk_name(void)
Expand Down
2 changes: 1 addition & 1 deletion microchip_harmony/pubnub_version_harmony.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "pubnub_version.h"

#define PUBNUB_SDK_NAME "Microchip.Harmony"
#define PUBNUB_SDK_VERSION "2.2.3"
#define PUBNUB_SDK_VERSION "2.2.4"


char const *pubnub_sdk_name(void)
Expand Down
2 changes: 1 addition & 1 deletion posix/pubnub_version_posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "pubnub_version.h"

#define PUBNUB_SDK_NAME "POSIX"
#define PUBNUB_SDK_VERSION "2.2.3"
#define PUBNUB_SDK_VERSION "2.2.4"


char const *pubnub_sdk_name(void)
Expand Down
4 changes: 2 additions & 2 deletions qt/pubnub_qt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ void pubnub_qt::sslErrors(QNetworkReply* reply,const QList<QSslError> &errors)

extern "C" char const *pubnub_sdk_name() { return "Qt5"; }

extern "C" char const *pubnub_uname() { return "Qt5%2F2.2.2"; }
extern "C" char const *pubnub_uname() { return "Qt5%2F2.2.4"; }

extern "C" char const *pubnub_version() { return "2.2.2"; }
extern "C" char const *pubnub_version() { return "2.2.4"; }

2 changes: 1 addition & 1 deletion windows/pubnub_version_windows.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "pubnub_version.h"

#define PUBNUB_SDK_NAME "Windows"
#define PUBNUB_SDK_VERSION "2.2.3"
#define PUBNUB_SDK_VERSION "2.2.4"


char const *pubnub_sdk_name(void)
Expand Down

0 comments on commit dc60e41

Please sign in to comment.