Skip to content

[PHP] add Accept encoding using CURLOPT_ENCODING #5525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 1 commit into from
May 6, 2017
Merged

[PHP] add Accept encoding using CURLOPT_ENCODING #5525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/swagger-codegen/src/main/resources/php/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class ApiClient
if ($this->config->getCurlConnectTimeout() != 0) {
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $this->config->getCurlConnectTimeout());
}

// return the result on success, rather than just true
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);

Expand Down Expand Up @@ -189,6 +189,10 @@ class ApiClient
$url = ($url . '?' . http_build_query($queryParams));
}

if ($this->config->getAllowEncoding()) {
curl_setopt($curl, CURLOPT_ENCODING, '');
}

if ($method === self::$POST) {
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
Expand Down
26 changes: 26 additions & 0 deletions modules/swagger-codegen/src/main/resources/php/configuration.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ class Configuration
*/
protected $proxyPassword;

/**
* Allow Curl encoding header
*
* @var bool
*/
protected $allowEncoding = false;

/**
* Constructor
*/
Expand Down Expand Up @@ -435,6 +442,16 @@ class Configuration
return $this;
}

/**
* Set whether to accept encoding
* @param bool $allowEncoding
*/
public function setAllowEncoding($allowEncoding)
{
$this->allowEncoding = $allowEncoding;
return $this;
}

/**
* Gets the HTTP connect timeout value
*
Expand All @@ -445,6 +462,15 @@ class Configuration
return $this->curlConnectTimeout;
}

/**
* Get whether to allow encoding
*
* @return bool
*/
public function getAllowEncoding()
{
return $this->allowEncoding;
}

/**
* Sets the HTTP Proxy Host
Expand Down
6 changes: 5 additions & 1 deletion samples/client/petstore/php/SwaggerClient-php/lib/ApiClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function callApi($resourcePath, $method, $queryParams, $postData, $header
if ($this->config->getCurlConnectTimeout() != 0) {
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $this->config->getCurlConnectTimeout());
}

// return the result on success, rather than just true
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);

Expand Down Expand Up @@ -199,6 +199,10 @@ public function callApi($resourcePath, $method, $queryParams, $postData, $header
$url = ($url . '?' . http_build_query($queryParams));
}

if ($this->config->getAllowEncoding()) {
curl_setopt($curl, CURLOPT_ENCODING, '');
}

if ($method === self::$POST) {
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $postData);
Expand Down
26 changes: 26 additions & 0 deletions samples/client/petstore/php/SwaggerClient-php/lib/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ class Configuration
*/
protected $proxyPassword;

/**
* Allow Curl encoding header
*
* @var bool
*/
protected $allowEncoding = false;

/**
* Constructor
*/
Expand Down Expand Up @@ -445,6 +452,16 @@ public function setCurlConnectTimeout($seconds)
return $this;
}

/**
* Set whether to accept encoding
* @param bool $allowEncoding
*/
public function setAllowEncoding($allowEncoding)
{
$this->allowEncoding = $allowEncoding;
return $this;
}

/**
* Gets the HTTP connect timeout value
*
Expand All @@ -455,6 +472,15 @@ public function getCurlConnectTimeout()
return $this->curlConnectTimeout;
}

/**
* Get whether to allow encoding
*
* @return bool
*/
public function getAllowEncoding()
{
return $this->allowEncoding;
}

/**
* Sets the HTTP Proxy Host
Expand Down