diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-14 15:53:15 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-14 15:53:15 +0100 |
| commit | cdf6c12262f37b0e44d6d2e693804f3749f73795 (patch) | |
| tree | 7daa0295f9b99d1937f2714d2fda07c1d8367ec2 /src/backend/taler-merchant-httpd_pay.c | |
| parent | 7b20ec17a7f5e0f3166f9daff2357e1fd5349005 (diff) | |
| parent | ad9764cb7ac78fcb32ee9de222cd8794e9d63737 (diff) | |
| download | merchant-cdf6c12262f37b0e44d6d2e693804f3749f73795.tar.gz merchant-cdf6c12262f37b0e44d6d2e693804f3749f73795.tar.bz2 merchant-cdf6c12262f37b0e44d6d2e693804f3749f73795.zip | |
Merge branch 'master' of ssh://taler.net/merchant
Diffstat (limited to 'src/backend/taler-merchant-httpd_pay.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 3feceb50..a920db06 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -662,7 +662,7 @@ process_pay_with_exchange (void *cls, { GNUNET_break_op (0); resume_pay_with_response (pc, - MHD_HTTP_NOT_ACCEPTABLE, + MHD_HTTP_METHOD_NOT_ACCEPTABLE, TMH_RESPONSE_make_external_error (TALER_EC_PAY_PAYMENT_INSUFFICIENT_DUE_TO_FEES, "insufficient funds (including excessive exchange fees to be covered by customer)")); return; @@ -676,7 +676,7 @@ process_pay_with_exchange (void *cls, { GNUNET_break_op (0); resume_pay_with_response (pc, - MHD_HTTP_NOT_ACCEPTABLE, + MHD_HTTP_METHOD_NOT_ACCEPTABLE, TMH_RESPONSE_make_external_error (TALER_EC_PAY_PAYMENT_INSUFFICIENT, "insufficient funds")); return; @@ -725,7 +725,7 @@ process_pay_with_exchange (void *cls, TMH_RESPONSE_make_json_pack ("{s:s, s:I, s:i}", "hint", "Coin signature invalid.", "code", (json_int_t) TALER_EC_PAY_COIN_SIGNATURE_INVALID, - + "coin_idx", i)); return; } @@ -1167,7 +1167,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, if (GNUNET_NO == pc->transaction_exits) { /* #4521 goes here: Check if the customer respects pay_deadline */ - now = GNUNET_TIME_absolute_get (); + now = GNUNET_TIME_absolute_get (); if (now.abs_value_us > pc->pay_deadline.abs_value_us) { /* Time expired, we don't accept this payment now! */ |