diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 12:42:44 +0200 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-08-11 12:42:44 +0200 |
| commit | 3933e70e713a090a9a5dd531bc82498945d42880 (patch) | |
| tree | 485059c56bd511c702e093fafbeb33b28efa2f05 | |
| parent | abe5971f7398bda68c0e2757ccb8cdbe23d081e5 (diff) | |
| download | merchant-3933e70e713a090a9a5dd531bc82498945d42880.tar.gz merchant-3933e70e713a090a9a5dd531bc82498945d42880.tar.bz2 merchant-3933e70e713a090a9a5dd531bc82498945d42880.zip | |
last commit before switching to the branch "light", \
aimed to cut off unneeded code got from the mint tree. \
Please, be aware that in this state the file src/backend/Makefile.am \
has some lines with hardcoded paths, this tune it as needed.
As of this commit, the merchant is able to receive a JSON request
for generating a certificate, store it, and return a JSON response.
To be documented.
| -rw-r--r-- | src/backend/Makefile.am | 6 | ||||
| -rw-r--r-- | src/frontend/cert.php | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index 9744a2dd..d6c08868 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -8,10 +8,10 @@ taler_merchant_httpd_SOURCES = \ taler-merchant-httpd.c \ merchant.c merchant.h \ merchant_db.c merchant_db.h \ - taler-mint-httpd_keystate.c taler-mint-httpd_keystate.h \ taler-mint-httpd_db.c taler-mint-httpd_db.h \ taler-mint-httpd_parsing.c taler-mint-httpd_parsing.h \ taler-mint-httpd_responses.c taler-mint-httpd_responses.h \ + taler-mint-httpd_keystate.c taler-mint-httpd_keystate.h \ taler-mint-httpd_mhd.c taler-mint-httpd_mhd.h \ taler-mint-httpd_admin.c taler-mint-httpd_admin.h \ taler-mint-httpd_deposit.c taler-mint-httpd_deposit.h \ @@ -20,8 +20,8 @@ taler_merchant_httpd_SOURCES = \ taler_merchant_httpd_LDADD = \ $(LIBGCRYPT_LIBS) \ - /home/marcello/trans_mint/src/util/libtalerutil.la \ - /home/marcello/trans_mint/src/mintdb/libtalermintdb.la \ + /home/marcello/Taler/trans_mint/src/util/libtalerutil.la \ + /home/marcello/Taler/trans_mint/src/mintdb/libtalermintdb.la \ -lmicrohttpd \ -ljansson \ -lgnunetutil \ diff --git a/src/frontend/cert.php b/src/frontend/cert.php index 9f0af350..501fe31b 100644 --- a/src/frontend/cert.php +++ b/src/frontend/cert.php @@ -60,12 +60,11 @@ else{ 'currency' => $currency))); // test // echo $json; - - //echo phpinfo (); + // echo phpinfo (); // crafting the request $req = new http\Client\Request ("POST", - "http://" . $SERVER["SERVER_NAME"] . "/backend" . "/contract", + "http://" . $_SERVER["SERVER_NAME"] . "/backend" . "/contract", //"http://localhost:9898/", array ("Content-Type" => "application/json")); $req->getBody()->append ($json); |