@@ -232,7 +232,7 @@ |
||
| 232 | 232 | * |
| 233 | 233 | * @param array $request Request data (same form as {@see request_multiple}) |
| 234 | 234 | * @param boolean $merge_options Should we merge options as well? |
| 235 | - * @return array Request data |
|
| 235 | + * @return string Request data |
|
| 236 | 236 | */ |
| 237 | 237 | protected function merge_request($request, $merge_options = true) { |
| 238 | 238 | if ($this->url !== null) { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * Returns false if $base is not absolute, otherwise an IRI. |
| 252 | 252 | * |
| 253 | - * @param Requests_IRI|string $base (Absolute) Base IRI |
|
| 253 | + * @param string $base (Absolute) Base IRI |
|
| 254 | 254 | * @param Requests_IRI|string $relative Relative IRI |
| 255 | 255 | * @return Requests_IRI|false |
| 256 | 256 | */ |
@@ -985,6 +985,7 @@ discard block |
||
| 985 | 985 | * Convert an IRI to a URI (or parts thereof) |
| 986 | 986 | * |
| 987 | 987 | * @param string|bool IRI to convert (or false from {@see get_iri}) |
| 988 | + * @param false|string $string |
|
| 988 | 989 | * @return string|false URI if IRI is valid, false otherwise. |
| 989 | 990 | */ |
| 990 | 991 | protected function to_uri($string) { |
@@ -353,7 +353,7 @@ |
||
| 353 | 353 | * @param int $delta |
| 354 | 354 | * @param int $numpoints |
| 355 | 355 | * @param bool $firsttime |
| 356 | - * @return int New bias |
|
| 356 | + * @return double New bias |
|
| 357 | 357 | * |
| 358 | 358 | * function adapt(delta,numpoints,firsttime): |
| 359 | 359 | */ |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | 'persistent' => false, |
| 75 | 75 | 'host-only' => true, |
| 76 | 76 | ); |
| 77 | - $this->flags = array_merge($default_flags, $flags); |
|
| 77 | + $this->flags = array_merge($default_flags, $flags); |
|
| 78 | 78 | |
| 79 | 79 | $this->reference_time = time(); |
| 80 | 80 | if ($reference_time !== null) { |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | // 'CN_match' => $host, |
| 80 | 80 | 'capture_peer_cert' => true, |
| 81 | 81 | ); |
| 82 | - $verifyname = true; |
|
| 82 | + $verifyname = true; |
|
| 83 | 83 | |
| 84 | 84 | // SNI, if enabled (OpenSSL >=0.9.8j) |
| 85 | 85 | if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) { |