Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187109
Change subject: UEModulePDF: Fixed bug when proxy is set
......................................................................
UEModulePDF: Fixed bug when proxy is set
*added $aOptions when files are uploaded
*added global $bsgUEModulePDFCURLOptions for proxy options
Change-Id: I7a622c0c09e62e9f02b5ea215e1165d25dc09449
---
M UEModulePDF/includes/PDFServlet.class.php
1 file changed, 8 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/09/187109/1
diff --git a/UEModulePDF/includes/PDFServlet.class.php
b/UEModulePDF/includes/PDFServlet.class.php
index 81a0403..3521c86 100644
--- a/UEModulePDF/includes/PDFServlet.class.php
+++ b/UEModulePDF/includes/PDFServlet.class.php
@@ -135,14 +135,18 @@
wfRunHooks( 'BSUEModulePDFUploadFilesBeforeSend',
array( $this, &$aPostData, $sType ) );
+ $aOptions = array(
+ 'timeout' => 120,
+ 'postData' => $aPostData
+ );
+
+ global $bsgUEModulePDFCURLOptions;
+ $aOptions = array_merge_recursive($aOptions,
$bsgUEModulePDFCURLOptions);
$vHttpEngine = Http::$httpEngine;
Http::$httpEngine = 'curl';
$sResponse = Http::post(
$this->aParams['soap-service-url'].'/UploadAsset',
- array(
- 'timeout' => 120,
- 'postData' => $aPostData
- )
+ $aOptions
);
Http::$httpEngine = $vHttpEngine;
--
To view, visit https://gerrit.wikimedia.org/r/187109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a622c0c09e62e9f02b5ea215e1165d25dc09449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
Gerrit-Reviewer: Jgoettlich <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
