View Options

	diff --git a/src/future/http/status/HTTPFutureCURLResponseStatus.php b/src/future/http/status/HTTPFutureCURLResponseStatus.php
	index 50c61805..cda6388e 100644
	--- a/src/future/http/status/HTTPFutureCURLResponseStatus.php
	+++ b/src/future/http/status/HTTPFutureCURLResponseStatus.php
	@@ -1,86 +1,86 @@
	<?php

	final class HTTPFutureCURLResponseStatus extends HTTPFutureResponseStatus {

	protected function getErrorCodeType($code) {
	return 'cURL';
	}

	public function isError() {
	return true;
	}

	public function isTimeout() {
	// NOTE: The PHP error constant for this is nonsensical (this is not an
	// error):
	//
	// PHP: CURLE_OPERATION_TIMEOUTED
	// cURL: CURLE_OPERATION_TIMEDOUT

	return ($this->getStatusCode() == CURLE_OPERATION_TIMEOUTED);
	}

	protected function getErrorCodeDescription($code) {
	$constants = get_defined_constants();

	$constant_name = null;
	foreach ($constants as $constant => $value) {
	if ($value == $code && preg_match('/^CURLE_/', $constant)) {
	$constant_name = '<'.$constant.'> ';
	break;
	}
	}

	$map = array(
	CURLE_COULDNT_RESOLVE_HOST => pht(
	'There was an error resolving the server hostname. Check that you are '.
	'connected to the internet and that DNS is correctly configured. (Did '.
	'you add the domain to `%s` on some other machine, but not this one?)',
	'/etc/hosts'),

	CURLE_SSL_CACERT => pht(
	'There was an error verifying the SSL Certificate Authority while '.
	'negotiating the SSL connection. This usually indicates that you are '.
	'using a self-signed certificate but have not added your CA to the '.
	'CA bundle. See instructions in "%s".',
	- 'libphutil/resources/ssl/README'),
	+ 'arcanist/resources/ssl/README'),

	// Apparently there's no error constant for this? In cURL it's
	// CURLE_SSL_CACERT_BADFILE but there's no corresponding constant in
	// PHP.
	77 => pht(
	'The SSL CA Bundles that we tried to use could not be read or are '.
	'not formatted correctly.'),

	CURLE_SSL_CONNECT_ERROR => pht(
	'There was an error negotiating the SSL connection. This usually '.
	'indicates that the remote host has a bad SSL certificate, or your '.
	'local host has some sort of SSL misconfiguration which prevents it '.
	'from accepting the CA. If you are using a self-signed certificate, '.
	'see instructions in "%s".',
	- 'libphutil/resources/ssl/README'),
	+ 'arcanist/resources/ssl/README'),

	CURLE_OPERATION_TIMEOUTED => pht(
	'The request took too long to complete.'),

	CURLE_SSL_PEER_CERTIFICATE => pht(
	'There was an error verifying the SSL connection. This usually '.
	'indicates that the remote host has an SSL certificate for a '.
	'different domain name than you are connecting with. Make sure the '.
	'certificate you have installed is signed for the correct domain.'),
	);

	$default_message = pht(
	'The cURL library raised an error while making a request. You may be '.
	'able to find more information about this error (error code: %d) '.
	'on the cURL site: %s',
	$code,
	'http://curl.haxx.se/libcurl/c/libcurl-errors.html#'.
	preg_replace('/[^A-Z]/', '', $constant_name));

	$detailed_message = idx($map, $code, $default_message);

	return $constant_name.$detailed_message;
	}

	}
	diff --git a/src/future/http/status/HTTPFutureCertificateResponseStatus.php b/src/future/http/status/HTTPFutureCertificateResponseStatus.php
	index d6e35f89..76bd5564 100644
	--- a/src/future/http/status/HTTPFutureCertificateResponseStatus.php
	+++ b/src/future/http/status/HTTPFutureCertificateResponseStatus.php
	@@ -1,33 +1,33 @@
	<?php

	final class HTTPFutureCertificateResponseStatus
	extends HTTPFutureResponseStatus {

	const ERROR_IMMUTABLE_CERTIFICATES = 1;

	protected function getErrorCodeType($code) {
	return 'Certificate';
	}

	public function isError() {
	return true;
	}

	public function isTimeout() {
	return false;
	}

	protected function getErrorCodeDescription($code) {
	return pht(
	"There was an error verifying the SSL Certificate Authority while ".
	"negotiating the SSL connection. This usually indicates you are ".
	"using a self-signed certificate.\n\n".
	"As of OSX Yosemite, certificates must be added to the OSX keychain. ".
	"You can do this with `security add-trusted-cert` from the command ".
	"line, or by visiting the site in Safari and choosing to trust the ".
	"certificate permanently.\n\n".
	'For more information, see instructions in "%s".',
	- 'libphutil/resources/ssl/README');
	+ 'arcanist/resources/ssl/README');
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 22:27 (6 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1129400
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions