Skip to content

Add content-length header only for messages containing zero byte #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vitalif wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add content-length header only for messages containing zero byte #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618d2bd
Fix compiler warning (assignment makes pointer from integer without a…
vitalif Aug 18, 2015
acf43f6
Only add content-length header for messages containing zero byte
vitalif Aug 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions php_stomp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ PHP_FUNCTION(stomp_connect)

if (stomp->status) {
stomp_frame_t *res;
int rres;
stomp_frame_t frame = {0};

INIT_FRAME(frame, "CONNECT");
Expand All @@ -549,9 +550,9 @@ PHP_FUNCTION(stomp_connect)
FRAME_HEADER_FROM_HASHTABLE(frame.headers, Z_ARRVAL_P(headers));
}

res = stomp_send(stomp, &frame TSRMLS_CC);
rres = stomp_send(stomp, &frame TSRMLS_CC);
CLEAR_FRAME(frame);
if (0 == res) {
if (0 == rres) {
zval *excobj = zend_throw_exception_ex(stomp_ce_exception, stomp->errnum TSRMLS_CC, stomp->error);
if (stomp->error_details) {
zend_update_property_string(stomp_ce_exception, excobj, "details", sizeof("details")-1, stomp->error_details TSRMLS_CC);
Expand Down Expand Up @@ -746,6 +747,8 @@ PHP_FUNCTION(stomp_send)
CLEAR_FRAME(frame);
RETURN_FALSE;
}
if (frame.body_length > 0 && strnlen(frame.body, frame.body_length) >= frame.body_length)
frame.body_length = 0;

if (stomp_send(stomp, &frame TSRMLS_CC) > 0) {
success = stomp_valid_receipt(stomp, &frame);
Expand Down