Merge remote-tracking branch 'upstream/master' into reporter

This commit is contained in:
Brad Warren 2015-06-03 11:41:25 -07:00
commit 3f37e3a241

View file

@ -125,10 +125,9 @@ def gen_authzr(authz_status, domain, challs, statuses, combos=True):
if combos:
authz_kwargs.update({"combinations": gen_combos(challbs)})
if authz_status == messages2.STATUS_VALID:
now = datetime.datetime.now()
authz_kwargs.update({
"status": authz_status,
"expires": datetime.datetime(now.year, now.month + 1, now.day),
"expires": datetime.datetime.now() + datetime.timedelta(days=31),
})
else:
authz_kwargs.update({