Changeset b8c336b for lib/oauth2.c

Timestamp:

2015-05-09T19:50:30Z (9 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (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 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• lib/oauth2.c (modified) (1 diff)

lib/oauth2.c

@@ -140 +140 @@
         struct oauth2_access_token_data *cb_data = req->data;
         char *atoken = NULL, *rtoken = NULL, *error = NULL;
-        char *content_type;
+        char *content_type = NULL;
 
-        if (getenv("BITLBEE_DEBUG") && req->reply_body) {
+        if (req->status_code <= 0 && !req->reply_body) {
+                cb_data->func(cb_data->data, NULL, NULL, req->status_string);
+                g_free(cb_data);
+                return;
+        }
+
+        if (getenv("BITLBEE_DEBUG")) {
                 printf("%s\n", req->reply_body);
         }