fixed #1 Unable to post json data

OOPS-ORG-PHP · Jun 14, 2022 · 2160f5c · 2160f5c
1 parent 8ef7d45
commit 2160f5c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/HTTPRelay.php b/HTTPRelay.php
@@ -126,6 +126,7 @@ function __construct ($header = null) {
  if ( $header['POSTTYPE'] ) {
  switch ($header['POSTTYPE']) {
  case 'form-data' :
+ case 'json' :
  case 'url-encode' :
  $this->posttype = $header['POSTTYPE'];
  }
@@ -275,9 +276,6 @@ public function fetch ($to, $tmout = 60, $httphost = '', $post = null, $recursio
  # header information
  $header = self::http_header ();
 
- if ( $this->debug )
- fprintf (STDERR, "** Header SET :\n%s\n", print_r ($header, true));
-
  curl_setopt ($c, CURLOPT_URL, $to);
  curl_setopt ($c, CURLOPT_TIMEOUT, $tmout);
  curl_setopt ($c, CURLOPT_NOPROGRESS, 1);
@@ -288,19 +286,32 @@ public function fetch ($to, $tmout = 60, $httphost = '', $post = null, $recursio
  );
  curl_setopt ($c, CURLOPT_HEADER, 0);
  curl_setopt ($c, CURLOPT_NOBODY, 0);
- curl_setopt ($c, CURLOPT_HTTPHEADER, $header);
  curl_setopt ($c, CURLOPT_FAILONERROR, 1);
  curl_setopt ($c, CURLINFO_HEADER_OUT, 1);
  if ( preg_match ('/^https:/', $to) )
  curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
 
- if ( $post && is_array ($post) ) {
+ if ( $post ) {
  curl_setopt ($c, CURLOPT_POST, 1);
- if ( $this->posttype == 'url-encode' )
- $post = http_build_query ($post);
+ if ( is_array ($post) ) {
+ if ( $this->posttype == 'json' ) {
+ self::set_header ($header, 'Content-Type', 'application/json');
+ $post = json_encode ($post);
+ } else if ( $this->posttype == 'url-encode' )
+ $post = http_build_query ($post);
+ } else {
+ // strings are json format, change Content-Type to 'application/json'
+ if ( json_decode ($post) != NULL )
+ self::set_header ($header, 'Content-Type', 'application/json');
+ }
  curl_setopt ($c, CURLOPT_POSTFIELDS, $post);
  }
 
+ curl_setopt ($c, CURLOPT_HTTPHEADER, $header);
+
+ if ( $this->debug )
+ fprintf (STDERR, "** Header SET :\n%s\n", print_r ($header, true));
+
  $data = curl_exec ($c);
  $info = $this->set_return_info ($c);
 

diff --git a/package.xml b/package.xml
@@ -12,7 +12,7 @@
  <active>yes</active>
  </lead>
  <date>2022-06-14</date>
- <time>21:23:33</time>
+ <time>21:56:27</time>
  <version>
  <release>1.0.6</release>
  <api>1.0.0</api>
@@ -22,11 +22,12 @@
  <api>stable</api>
  </stability>
  <license>BSD</license>
- <notes>* fixed #2 Overwrite for existing headers in set_header method
+ <notes>* fixed #1 Unable to post json data
+* fixed #2 Overwrite for existing headers in set_header method
 </notes>
  <contents>
  <dir name="/">
- <file role="php" md5sum="1e99dce2b9183c4e5b85538e56fc769b" name="HTTPRelay.php" />
+ <file role="php" md5sum="04ca4e0b2b6a8e9de67ed691f4f16c55" name="HTTPRelay.php" />
  </dir>
  </contents>
  <dependencies>
@@ -57,7 +58,8 @@
  </stability>
  <date>2022-06-14</date>
  <license>BSD</license>
- <notes>* fixed #2 Overwrite for existing headers in set_header method
+ <notes>* fixed #1 Unable to post json data
+* fixed #2 Overwrite for existing headers in set_header method
 </notes>
  </release>
  <release>

diff --git a/package.xml.tmpl b/package.xml.tmpl
@@ -22,7 +22,8 @@
  <api>stable</api>
  </stability>
  <license>BSD</license>
- <notes>* fixed #2 Overwrite for existing headers in set_header method
+ <notes>* fixed #1 Unable to post json data
+* fixed #2 Overwrite for existing headers in set_header method
 </notes>
  <contents>
  <dir name="/">
@@ -57,7 +58,8 @@
  </stability>
  <date>@curdate@</date>
  <license>BSD</license>
- <notes>* fixed #2 Overwrite for existing headers in set_header method
+ <notes>* fixed #1 Unable to post json data
+* fixed #2 Overwrite for existing headers in set_header method
 </notes>
  </release>
  <release>