![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 10512 for trunk/wp-includes/http.php
- Timestamp:
- 02/05/2009 09:59:37 PM (18 years ago)
- File:
-
- 1 edited
-
trunk/wp-includes/http.php (modified) (33 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/http.php
r10509 r10512 352 352 * @param string $url URI resource. 353 353 * @param str|array $args Optional. Override the defaults. 354 * @return boolean354 * @return array containing 'headers', 'body', 'response', 'cookies' 355 355 */ 356 356 function request( $url, $args = array() ) { … … 400 400 unset($r['headers']['user-agent']); 401 401 } 402 403 // Construct Cookie: header if any cookies are set 404 WP_Http::buildCookieHeader( $r ); 402 405 403 406 if( WP_Http_Encoding::is_available() ) … … 425 428 do_action('http_api_debug', $transports, 'transports_list'); 426 429 427 $response = array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );430 $response = array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 428 431 foreach( (array) $transports as $transport ) { 429 432 $response = $transport->request($url, $r); 430 433 431 434 if( has_action('http_api_debug') ) 432 435 do_action( 'http_api_debug', $response, 'response', get_class($transport) ); … … 520 523 * 521 524 * @param string|array $headers 522 * @return array Processed string headers 525 * @return array Processed string headers. If duplicate headers are encountered, 526 * Then a numbered array is returned as the value of that header-key. 523 527 */ 524 528 function processHeaders($headers) { … … 528 532 $response = array('code' => 0, 'message' => ''); 529 533 534 $cookies = array(); 530 535 $newheaders = array(); 531 536 foreach ( $headers as $tempheader ) { … … 542 547 list($key, $value) = explode(':', $tempheader, 2); 543 548 544 if ( ! empty($value) ) 545 $newheaders[strtolower($key)] = trim($value); 546 } 547 548 return array('response' => $response, 'headers' => $newheaders); 549 } 550 549 if ( !empty( $value ) ) { 550 $key = strtolower( $key ); 551 if ( isset( $newheaders[$key] ) ) { 552 $newheaders[$key] = array( $newheaders[$key], trim( $value ) ); 553 } else { 554 $newheaders[$key] = trim( $value ); 555 } 556 if ( 'set-cookie' == strtolower( $key ) ) 557 $cookies[] = new WP_Http_Cookie( $value ); 558 } 559 } 560 561 return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies); 562 } 563 564 /** 565 * Takes the arguments for a ::request() and checks for the cookie array. 566 * If it's found, then it's assumed to contain WP_Http_Cookie objects, which 567 * are each parsed into strings and added to the Cookie: header (within the 568 * arguments array). Edits the array by reference. 569 * 570 * @access public 571 * @static 572 * 573 * @param array $r Full array of args passed into ::request() 574 */ 575 function buildCookieHeader( &$r ) { 576 if ( count( $r['cookies'] ) ) { 577 $cookies_header = ''; 578 foreach ( $r['cookies'] as $cookie ) { 579 $cookies_header .= $cookie->getHeaderValue() . '; '; 580 } 581 $cookies_header = substr( $cookies_header, 0, -2 ); 582 $r['headers']['cookie'] = $cookies_header; 583 } 584 } 585 551 586 /** 552 587 * Decodes chunk transfer-encoding, based off the HTTP 1.1 specification. … … 619 654 * @param string $url URI resource. 620 655 * @param str|array $args Optional. Override the defaults. 621 * @return array 'headers', 'body', and 'response' keys.656 * @return array 'headers', 'body', 'cookies' and 'response' keys. 622 657 */ 623 658 function request($url, $args = array()) { … … 638 673 unset($r['headers']['user-agent']); 639 674 } 675 676 // Construct Cookie: header if any cookies are set 677 WP_Http::buildCookieHeader( $r ); 640 678 641 679 $iError = null; // Store error number … … 711 749 if ( ! $r['blocking'] ) { 712 750 fclose($handle); 713 return array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );751 return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 714 752 } 715 753 … … 746 784 $process['body'] = WP_Http_Encoding::decompress( $process['body'] ); 747 785 748 return array('headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'] );786 return array('headers' => $arrHeaders['headers'], 'body' => $process['body'], 'response' => $arrHeaders['response'], 'cookies' => $arrHeaders['cookies']); 749 787 } 750 788 … … 794 832 * @param string $url URI resource. 795 833 * @param str|array $args Optional. Override the defaults. 796 * @return array 'headers', 'body', and 'response' keys.834 * @return array 'headers', 'body', 'cookies' and 'response' keys. 797 835 */ 798 836 function request($url, $args = array()) { … … 803 841 'redirection' => 5, 'httpversion' => '1.0', 804 842 'blocking' => true, 805 'headers' => array(), 'body' => null 843 'headers' => array(), 'body' => null, 'cookies' => array() 806 844 ); 807 845 … … 830 868 if ( ! $r['blocking'] ) { 831 869 fclose($handle); 832 return array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );870 return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 833 871 } 834 872 … … 859 897 $strResponse = WP_Http_Encoding::decompress( $strResponse ); 860 898 861 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'] );899 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies']); 862 900 } 863 901 … … 898 936 * @param string $url 899 937 * @param str|array $args Optional. Override the defaults. 900 * @return array 'headers', 'body', and 'response' keys.938 * @return array 'headers', 'body', 'cookies' and 'response' keys. 901 939 */ 902 940 function request($url, $args = array()) { … … 905 943 'redirection' => 5, 'httpversion' => '1.0', 906 944 'blocking' => true, 907 'headers' => array(), 'body' => null 945 'headers' => array(), 'body' => null, 'cookies' => array() 908 946 ); 909 947 … … 917 955 unset($r['headers']['user-agent']); 918 956 } 957 958 // Construct Cookie: header if any cookies are set 959 WP_Http::buildCookieHeader( $r ); 919 960 920 961 $arrURL = parse_url($url); … … 969 1010 stream_set_blocking($handle, 0); 970 1011 fclose($handle); 971 return array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );1012 return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 972 1013 } 973 1014 … … 989 1030 $strResponse = WP_Http_Encoding::decompress( $strResponse ); 990 1031 991 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'] );1032 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response'], 'cookies' => $processedHeaders['cookies']); 992 1033 } 993 1034 … … 1035 1076 * @param string $url 1036 1077 * @param str|array $args Optional. Override the defaults. 1037 * @return array 'headers', 'body', and 'response' keys.1078 * @return array 'headers', 'body', 'cookies' and 'response' keys. 1038 1079 */ 1039 1080 function request($url, $args = array()) { … … 1042 1083 'redirection' => 5, 'httpversion' => '1.0', 1043 1084 'blocking' => true, 1044 'headers' => array(), 'body' => null 1085 'headers' => array(), 'body' => null, 'cookies' => array() 1045 1086 ); 1046 1087 … … 1054 1095 unset($r['headers']['user-agent']); 1055 1096 } 1097 1098 // Construct Cookie: header if any cookies are set 1099 WP_Http::buildCookieHeader( $r ); 1056 1100 1057 1101 switch ( $r['method'] ) { … … 1093 1137 1094 1138 if ( ! $r['blocking'] ) 1095 return array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );1139 return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 1096 1140 1097 1141 list($theHeaders, $theBody) = explode("\r\n\r\n", $strResponse, 2); … … 1112 1156 $theResponse['message'] = get_status_header_desc($info['response_code']); 1113 1157 1114 return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $theResponse );1158 return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $theResponse, 'cookies' => $theHeaders['cookies']); 1115 1159 } 1116 1160 … … 1149 1193 * @param string $url 1150 1194 * @param str|array $args Optional. Override the defaults. 1151 * @return array 'headers', 'body', and 'response' keys.1195 * @return array 'headers', 'body', 'cookies' and 'response' keys. 1152 1196 */ 1153 1197 function request($url, $args = array()) { … … 1156 1200 'redirection' => 5, 'httpversion' => '1.0', 1157 1201 'blocking' => true, 1158 'headers' => array(), 'body' => null 1202 'headers' => array(), 'body' => null, 'cookies' => array() 1159 1203 ); 1160 1204 … … 1168 1212 unset($r['headers']['user-agent']); 1169 1213 } 1214 1215 // Construct Cookie: header if any cookies are set 1216 WP_Http::buildCookieHeader( $r ); 1170 1217 1171 1218 // cURL extension will sometimes fail when the timeout is less than 1 as … … 1204 1251 curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true ); 1205 1252 1206 if( ! is_null($r['headers']) ) 1207 curl_setopt( $handle, CURLOPT_HTTPHEADER, $r['headers'] ); 1253 if ( !empty( $r['headers'] ) ) { 1254 // cURL expects full header strings in each element 1255 $headers = array(); 1256 foreach ( $r['headers'] as $name => $value ) { 1257 $headers[] = "{$name}: $value"; 1258 } 1259 curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers ); 1260 } 1208 1261 1209 1262 if ( $r['httpversion'] == '1.0' ) … … 1217 1270 do_action_ref_array( 'http_api_curl', array(&$handle) ); 1218 1271 1219 // We don't need to return the body, so don't. Just execut ionrequest1272 // We don't need to return the body, so don't. Just execute request 1220 1273 // and return. 1221 1274 if ( ! $r['blocking'] ) { 1222 1275 curl_exec( $handle ); 1223 1276 curl_close( $handle ); 1224 return array( 'headers' => array(), 'body' => '', 'response' => array('code' , 'message') );1277 return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() ); 1225 1278 } 1226 1279 … … 1242 1295 return new WP_Error('http_request_failed', __('Too many redirects.')); 1243 1296 1244 $theHeaders = array( 'headers' => array() );1297 $theHeaders = array( 'headers' => array(), 'cookies' => array() ); 1245 1298 $theBody = ''; 1246 1299 } … … 1255 1308 $theBody = WP_Http_Encoding::decompress( $theBody ); 1256 1309 1257 return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response );1310 return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $response, 'cookies' => $theHeaders['cookies']); 1258 1311 } 1259 1312 … … 1274 1327 } 1275 1328 1329 1330 /** 1331 * Internal representation of a cookie. 1332 * 1333 * Returned cookies are represented using this class, and when cookies are 1334 * set, if they are not already a WP_Http_Cookie() object, then they are turned 1335 * into one. 1336 * 1337 * @package WordPress 1338 * @subpackage HTTP 1339 */ 1340 class WP_Http_Cookie { 1341 var $name, 1342 $value, 1343 $expires, 1344 $path, 1345 $domain; 1346 1347 /** 1348 * PHP4 style Constructor - Calls PHP5 Style Constructor 1349 */ 1350 function WP_Http_Cookie( $data ) { 1351 return $this->__construct( $data ); 1352 } 1353 1354 /** 1355 * Sets up this cookie object. 1356 * 1357 * @access public 1358 * 1359 * @param mixed $data Either an associative array describing the cookie, or a header-string detailing it. 1360 * If it's an array, it should include the following elements: 1361 * - name 1362 * - value [should NOT be urlencoded already] 1363 * - expires (optional) String or int (UNIX timestamp) 1364 * - path (optional) 1365 * - domain (optional) 1366 */ 1367 function __construct( $data ) { 1368 if ( is_string( $data ) ) { 1369 // Assume it's a header string direct from a previous request 1370 $pairs = explode( ';', $data ); 1371 1372 // Special handling for first pair; name=value. Also be careful of "=" in value 1373 $name = trim( substr( $pairs[0], 0, strpos( $pairs[0], '=' ) ) ); 1374 $value = substr( $pairs[0], strpos( $pairs[0], '=' ) + 1 ); 1375 $this->name = $name; 1376 $this->value = urldecode( $value ); 1377 array_shift( $pairs ); 1378 1379 // Set everything else as a property 1380 foreach ( $pairs as $pair ) { 1381 list( $key, $val ) = explode( '=', $pair ); 1382 $key = strtolower( trim( $key ) ); 1383 if ( 'expires' == $key ) 1384 $val = strtotime( $val ); 1385 $this->$key = $val; 1386 } 1387 } else { 1388 // Set properties based directly on parameters 1389 $this->name = $data['name']; 1390 $this->value = $data['value']; 1391 $this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] ); 1392 $this->path = $data['path']; 1393 $this->domain = $data['domain']; 1394 } 1395 } 1396 1397 /** 1398 * Confirms that it's OK to send this cookie to the URL checked against. 1399 * 1400 * Decision is based on RFC 2109/2965, so look there for details on validity. 1401 * 1402 * @access public 1403 * 1404 * @param string $url URL you intend to send this cookie to 1405 * @return boolean TRUE if allowed, FALSE otherwise. 1406 */ 1407 function test( $url ) { 1408 // Expires - if expired then nothing else matters 1409 if ( time() > $this->expires ) 1410 return false; 1411 1412 // Get details on the URL we're thinking about sending to 1413 $url = parse_url( $url ); 1414 $url['port'] = isset( $url['port'] ) ? $url['port'] : 80; 1415 $url['path'] = isset( $url['path'] ) ? $url['path'] : '/'; 1416 1417 // Values to use for comparison against the URL 1418 $path = isset( $this->path ) ? $this->path : '/'; 1419 $port = isset( $this->port ) ? $this->port : 80; 1420 $domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] ); 1421 if ( false === stripos( $domain, '.' ) ) 1422 $domain .= '.local'; 1423 1424 // Host - very basic check that the request URL ends with the domain restriction (minus leading dot) 1425 $domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain; 1426 if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) 1427 return false; 1428 1429 // Port - supports "port-lists" in the format: "80,8000,8080" 1430 if ( !in_array( $url['port'], explode( ',', $port) ) ) 1431 return false; 1432 1433 // Path - request path must start with path restriction 1434 if ( substr( $url['path'], 0, strlen( $path ) ) != $path ) 1435 return false; 1436 1437 return true; 1438 } 1439 1440 function getHeaderValue() { 1441 if ( empty( $this->name ) || empty( $this->value ) ) 1442 return ''; 1443 1444 return $this->name . '=' . urlencode( $this->value ); 1445 } 1446 1447 function getFullHeader() { 1448 return 'Cookie: ' . $this->getHeaderValue(); 1449 } 1450 } 1451 1276 1452 /** 1277 1453 * Returns the initialized WP_Http Object … … 1297 1473 * 1298 1474 * <code> 1299 * $res = array( 'headers' => array(), 'response' => array('code' , 'message') );1475 * $res = array( 'headers' => array(), 'response' => array('code' => int, 'message' => string) ); 1300 1476 * </code> 1301 1477 *
Note:
See TracChangeset
for help on using the changeset viewer.
