Merge branch 'bugfix_no_expires'

2012-10-12 16:25:17 +00:00
parent cfad7f4bfe 78387e9567
commit 0a1487c093
1 changed files with 2 additions and 1 deletions
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -189,7 +189,8 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
 	
 	GETSTR(workid, workid);
 	
-	GETNUM(expires);
+	if (json_object_get(json, "expires"))
+		GETNUM(expires);
 	
 	GETSTR(longpollid, lp.id);
 	GETSTR(longpolluri, lp.uri);