Changeset b79308b for lib/url.h

Timestamp:

2008-04-14T13:10:53Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

• lib/url.h (modified) (2 diffs)

lib/url.h

@@ -26 +26 @@
 #include "bitlbee.h"
 
-#define PROTO_HTTP              2
-#define PROTO_HTTPS             5
-#define PROTO_SOCKS4    3
-#define PROTO_SOCKS5    4
-#define PROTO_DEFAULT   PROTO_HTTP
+#define PROTO_HTTP      2
+#define PROTO_HTTPS     5
+#define PROTO_SOCKS4    3
+#define PROTO_SOCKS5    4
+#define PROTO_DEFAULT   PROTO_HTTP
 
 typedef struct url
@@ -36 +36 @@
         int proto;
         int port;
-        char host[MAX_STRING];
-        char file[MAX_STRING];
-        char user[MAX_STRING];
-        char pass[MAX_STRING];
+        char host[MAX_STRING+1];
+        char file[MAX_STRING+1];
+        char user[MAX_STRING+1];
+        char pass[MAX_STRING+1];
 } url_t;