Changeset f05d3e3


Ignore:
Timestamp:
01/05/12 21:04:37 (5 months ago)
Author:
mrook
Branches:
master
Children:
f3e60a4
Parents:
8bea7a4
git-author:
Michiel Rook <mrook@…> (01/05/12 21:04:37)
git-committer:
Michiel Rook <mrook@…> (01/05/12 21:04:37)
Message:

Revert past superfluous commit for HttpRequestTask (it already allows proxy settings)

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • classes/phing/tasks/ext/HttpRequestTask.php

    • Property mode changed from 100755 to 100644
    r8f2c6c5 rf05d3e3  
    4242 
    4343    /** 
    44      * Holds the proxy 
    45      * 
    46      * @var string 
    47      */ 
    48     protected $_proxy = null; 
    49  
    50     /** 
    5144     * Holds the regular expression that should match the response 
    5245     * 
    … …  
    122115 
    123116    /** 
    124      * Sets the proxy 
    125      *  
    126      * @param string $proxy 
    127      */ 
    128     public function setProxy($proxy) { 
    129         $this->_proxy = $proxy; 
    130     } 
    131      
    132     /** 
    133117     * Sets the response regex 
    134118     * 
    … …  
    256240        } 
    257241 
    258         $config = array(); 
    259         if (isset($this->_proxy) && $url = parse_url($this->_proxy)) { 
    260             $config['proxy_user'] = $url['user']; 
    261             $config['proxy_password'] = $url['pass']; 
    262             $config['proxy_host'] = $url['host']; 
    263             $config['proxy_port'] = $url['port']; 
    264         } 
    265          
    266         $request = new HTTP_Request2($this->_url, $config); 
     242        $request = new HTTP_Request2($this->_url); 
    267243 
    268244        // set the authentication data 

  • docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html

    r8f2c6c5 rf05d3e3  
    21692169                                <td>Yes</td> 
    21702170                        </tr> 
    2171             <tr> 
    2172                 <td>proxy</td> 
    2173                 <td>String</td> 
    2174                 <td>The proxy to use, such as <em>http://user:password@hostname:port/</em></td> 
    2175                 <td>n/a</td> 
    2176                 <td>No</td> 
    2177             </tr> 
    21782171                        <tr> 
    21792172                                <td>responseRegex</td> 
Note: See TracChangeset for help on using the changeset viewer.