| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -732,12 +732,7 @@ |
| 733 | 733 | $options['content'] = $this->postData; |
| 734 | 734 | } |
| 735 | 735 | |
| 736 | | - $oldTimeout = false; |
| 737 | | - if ( version_compare( '5.2.1', phpversion(), '>' ) ) { |
| 738 | | - $oldTimeout = ini_set( 'default_socket_timeout', $this->timeout ); |
| 739 | | - } else { |
| 740 | | - $options['timeout'] = $this->timeout; |
| 741 | | - } |
| | 736 | + $options['timeout'] = $this->timeout; |
| 742 | 737 | |
| 743 | 738 | $context = stream_context_create( array( 'http' => $options ) ); |
| 744 | 739 | |
| — | — | @@ -778,10 +773,6 @@ |
| 779 | 774 | } |
| 780 | 775 | } while ( true ); |
| 781 | 776 | |
| 782 | | - if ( $oldTimeout !== false ) { |
| 783 | | - ini_set( 'default_socket_timeout', $oldTimeout ); |
| 784 | | - } |
| 785 | | - |
| 786 | 777 | $this->setStatus(); |
| 787 | 778 | |
| 788 | 779 | if ( $fh === false ) { |