From 042125a76f32d208cd91ed59e843d6d5f194d028 Mon Sep 17 00:00:00 2001
From: Vedmaka <god.vedmaka@gmail.com>
Date: Sun, 11 Feb 2024 21:12:45 +0400
Subject: [PATCH] Fixes accept header not sent via GET request

* `Accept` header for the GET curl request was sent as an `Accept` URL parameter rather than a header, fixed by adding `$arrayHeader` param to the `fetchUrl` method of the `Curl` class
* Adds `format` URL parameter to GET requests to support AWS Neptune
---
 src/Curl.php         |  7 ++++++-
 src/SparqlClient.php | 12 +++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Curl.php b/src/Curl.php
index 7e5bfb7..00b1d6b 100644
--- a/src/Curl.php
+++ b/src/Curl.php
@@ -198,11 +198,12 @@ public function sendPostData($url, $postData, $arrayHeader = null, $ip = null, $
      *
      * @param string $url
      * @param array $getData get data array ie. $foo['get_var_name'] = $value (default null)
+     * @param array $arrayHeader header array of the HTTP request (default null)
      * @param string $ip address to bind (default null)
      * @param int $timeout in sec for complete curl operation (default 600)
      * @return bool|string data
      */
-    public function fetchUrl($url, $getData = null, $ip = null, $timeout = 600)
+    public function fetchUrl($url, $getData = null, $arrayHeader = null, $ip = null, $timeout = 600)
     {
         if ($this->_debug) {
             curl_setopt($this->_curlHandler, CURLOPT_VERBOSE, true);
@@ -224,6 +225,10 @@ public function fetchUrl($url, $getData = null, $ip = null, $timeout = 600)
             $get_string = null;
         }
 
+        // set header
+        if ($arrayHeader != null)
+            curl_setopt($this->_curlHandler, CURLOPT_HTTPHEADER, $arrayHeader);
+
         // set url to post to
         if (empty($get_string)) {
             curl_setopt($this->_curlHandler, CURLOPT_URL, $url);
diff --git a/src/SparqlClient.php b/src/SparqlClient.php
index eda77d2..a1f678d 100644
--- a/src/SparqlClient.php
+++ b/src/SparqlClient.php
@@ -637,13 +637,13 @@ public function queryRead($query, $typeOutput = "application/sparql-results+xml"
                 $response = $client->sendPostData($sUri, $data,null, null, $timeout);
             } else {
                 //TODO PHP8.0 use named arguments
-                $response = $client->fetchUrl($sUri, $data, null, $timeout); // fix for wikidata
+                $response = $client->fetchUrl($sUri, $data, null, null, $timeout); // fix for wikidata
             }
         } else {
             $data = array(
                 $this->_nameParameterQueryRead => $query,
                 "output" => Mimetype::getShortNameOfMimetype($typeOutput), // possible fix for 4store/fuseki..
-                "Accept" => $typeOutput
+                "format" => Mimetype::getShortNameOfMimetype($typeOutput) // some endpoints use 'format' param
             ); // fix for sesame
                                       // print_r($data);
             if ($this->_methodHTTPRead == "POST") {
@@ -653,7 +653,9 @@ public function queryRead($query, $typeOutput = "application/sparql-results+xml"
                 ),null, $timeout);
             } else {
                 //TODO PHP8.0 use named arguments
-                $response = $client->fetchUrl($sUri, $data,null, $timeout); // fix for wikidata
+                $response = $client->fetchUrl($sUri, $data, array(
+                    'Accept: ' . $typeOutput
+                ), null, $timeout); // fix for wikidata
             }
         }
 
@@ -720,7 +722,7 @@ public function queryUpdate($query, $typeOutput = "application/sparql-results+xm
                 $response = $client->sendPostData($sUri, $data, null, null, $timeout);
             } else {
                 //TODO PHP8.0 use named arguments
-                $response = $client->fetchUrl($sUri, $data,null, $timeout); // fix for wikidata
+                $response = $client->fetchUrl($sUri, $data, null, null, $timeout); // fix for wikidata
             }
         } else {
             $data = array(
@@ -737,7 +739,7 @@ public function queryUpdate($query, $typeOutput = "application/sparql-results+xm
                 ), null, $timeout);
             } else {
                 //TODO PHP8.0 use named arguments
-                $response = $client->fetchUrl($sUri, $data, null, $timeout); // fix for wikidata
+                $response = $client->fetchUrl($sUri, $data, null,  null, $timeout); // fix for wikidata
             }
         }