Commits

Anonymous committed 92e2eb9

Small bugfixes for http-push.c

This patch fixes three things:

- older libexpat does not know about enum XML_Status
- as in my patch for http-fetch, do not rely on a curl result in
free()d data
- calloc the new_lock structure

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

  • Participants
  • Parent commits 0dd276b

Comments (0)

Files changed (1)

 #define NO_CURL_EASY_DUPHANDLE
 #endif
 
+#ifndef XML_STATUS_OK
+enum XML_Status {
+  XML_STATUS_OK = 1,
+  XML_STATUS_ERROR = 0
+};
+#define XML_STATUS_OK    1
+#define XML_STATUS_ERROR 0
+#endif
+
 #define RANGE_HEADER_SIZE 30
 
 /* DAV method names and request body templates */
 			       slot->curl != curl_message->easy_handle)
 				slot = slot->next;
 			if (slot != NULL) {
+				int curl_result = curl_message->data.result;
 				curl_multi_remove_handle(curlm, slot->curl);
 				active_requests--;
 				slot->done = 1;
 				slot->in_use = 0;
-				slot->curl_result = curl_message->data.result;
+				slot->curl_result = curl_result;
 				curl_easy_getinfo(slot->curl,
 						  CURLINFO_HTTP_CODE,
 						  &slot->http_code);
 	in_buffer.posn = 0;
 	in_buffer.buffer = in_data;
 
-	new_lock = xmalloc(sizeof(*new_lock));
+	new_lock = xcalloc(1, sizeof(*new_lock));
 	new_lock->owner = NULL;
 	new_lock->token = NULL;
 	new_lock->timeout = -1;