You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2014/04/14 16:16:31 UTC

svn commit: r1587214 - in /qpid/proton/trunk: proton-c/src/ssl/openssl.c tests/python/proton_tests/ssl.py

Author: kgiusti
Date: Mon Apr 14 14:16:31 2014
New Revision: 1587214

URL: http://svn.apache.org/r1587214
Log:
PROTON-560: fix incorrect frame size calculation.

Modified:
    qpid/proton/trunk/proton-c/src/ssl/openssl.c
    qpid/proton/trunk/tests/python/proton_tests/ssl.py

Modified: qpid/proton/trunk/proton-c/src/ssl/openssl.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/openssl.c?rev=1587214&r1=1587213&r2=1587214&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/openssl.c Mon Apr 14 14:16:31 2014
@@ -906,7 +906,7 @@ static ssize_t process_input_ssl( pn_io_
               // no max frame limit - grow it.
               char *newbuf = (char *)malloc( max_frame );
               if (newbuf) {
-                ssl->in_size *= max_frame;
+                ssl->in_size = max_frame;
                 memmove( newbuf, ssl->inbuf, ssl->in_count );
                 free( ssl->inbuf );
                 ssl->inbuf = newbuf;

Modified: qpid/proton/trunk/tests/python/proton_tests/ssl.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/python/proton_tests/ssl.py?rev=1587214&r1=1587213&r2=1587214&view=diff
==============================================================================
--- qpid/proton/trunk/tests/python/proton_tests/ssl.py (original)
+++ qpid/proton/trunk/tests/python/proton_tests/ssl.py Mon Apr 14 14:16:31 2014
@@ -18,7 +18,10 @@
 #
 
 import os, common
+import random
+import string
 import subprocess
+
 from proton import *
 from common import Skipped, pump
 
@@ -877,7 +880,9 @@ class MessengerSSLTests(common.Test):
 
         msg = Message()
         msg.address = "amqps://127.0.0.1:12345"
-        msg.body = "Hello World!"
+        # make sure a large, uncompressible message body works!
+        msg.body = "".join(random.choice(string.ascii_letters)
+                           for x in range(10099))
         trk = self.client.put(msg)
         self.client.send()
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org