Changeset 3fbce97 for protocols/jabber/s5bytestream.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/jabber/s5bytestream.c (modified) (2 diffs)

protocols/jabber/s5bytestream.c

@@ -536 +536 @@
                  * that sends atyp=0 addrlen=0 and only 6 bytes (one less than one would expect).
                  * Therefore I removed the wait for more bytes. Since we don't care about what else the proxy
-                 * is sending, it shouldnt matter */
+                 * is sending, it should not matter */
 
                 if (bt->tf->ft->sending) {
@@ -559 +559 @@
  * An intelligent sender would probably specify himself as the first streamhost and
  * a proxy as the second (Kopete and PSI are examples here). That way, a (potentially)
- * slow proxy is only used if neccessary. This of course also means, that the timeout
+ * slow proxy is only used if necessary. This of course also means, that the timeout
  * per streamhost should be kept short. If one or two firewalled adresses are specified,
  * they have to timeout first before a proxy is tried.