Merge branch 'master' of git+ssh://taler.net/var/git/wallet-webex

This commit is contained in:
Christian Grothoff 2016-08-26 15:32:29 +02:00
commit e245e9dff7

View File

@ -913,7 +913,8 @@ in the header.
HTTP/1.1 402 Payment Required HTTP/1.1 402 Payment Required
Content-Type: text/html; charset=UTF-8 Content-Type: text/html; charset=UTF-8
X-Taler-Contract-Hash: 2BAH2AT4GSG5JRM2W4YWTSYGY66EK4X8CX2V69D5VF7XV703AJMG X-Taler-Contract-Hash: 2BAH2AT4GSG5JRM2W4YWTSYGY66EK4X8CX2V69D5VF7XV703AJMG
X-Taler-Offer-Url: https://shop/generate-contract/42 X-Taler-Offer-Url: https://shop/essay/The_GNU_Project
X-Taler-Pay-Url: https://shop/pay
... ...
<!DOCTYPE html> <!DOCTYPE html>
@ -925,11 +926,11 @@ X-Taler-Offer-Url: https://shop/generate-contract/42
... ...
</html> </html>
\end{lstlisting} \end{lstlisting}
\caption{Sample HTTP response when the user agent navigates to a \caption{Sample HTTP response when the user agent navigates to a fulfillment
fulfillment URL without URL without the session state that indicates they have paid for the resource.
the session state that indicates they have paid for the resource. Note that unlike in Listing~\ref{listing:http-contract}, the response
Note that unlike in Listing~\ref{listing:http-contract}, the response references references a contract that typically is already known to the wallet via its
a contract that typically is already known to the wallet via its hash code.} hash code.}
\label{listing:http-execute} \label{listing:http-execute}
\end{figure*} \end{figure*}