*** ./extlib/rss_fetch.inc      2006-03-20 13:07:30.000000000 +0000
--- /tmp/gregarius/extlib/rss_fetch.inc 2006-01-09 11:35:00.000000000 +0000
***************
*** 310,320 ****
      $client->agent = MAGPIE_USER_AGENT;
      $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
      $client->use_gzip = MAGPIE_USE_GZIP;
-     if (($prx = getConfig('rss.config.proxy')) != '') {
-         $client->proxy_host = $prx;
-         $client->proxy_port = getConfig('rss.config.proxyport');
-     }
- 
      if (is_array($headers) ) {
          $client->rawheaders = $headers;
      }
--- 310,315 ----
diff -rc ./schema.php /tmp/gregarius/schema.php
*** ./schema.php        2006-03-20 13:07:01.000000000 +0000
--- /tmp/gregarius/schema.php   2006-03-13 15:33:43.000000000 +0000
***************
*** 440,449 ****
                "rss.config.markreadonupdate"=> array("false","false","boolean",
"Mark all old unread feeds as read when updating if new unread feeds are found."
,NULL),
                "rss.output.lang"                       =>              array("e
n,es,fr,dk,it,pt_BR,se,0","en,es,fr,dk,it,pt_BR,se,0","enum","Language pack to u
se.",NULL),
                "rss.config.absoluteordering"=> array("true","true","boolean","A
llow feeds and folders to be ordered by their order in the admin section. If thi
s option is set to false, channels and folders will be organized alphabetically 
by their titles.",NULL),
-               "rss.config.proxy"              =>
-       array("","","string","The hostname of your web proxy if you have one.",N
ULL),
-               "rss.config.proxyport"          =>
-       array("80","80","num","The port number for your proxy host",NULL),
                "rss.config.robotsmeta"         =>              array("noindex,f
ollow","noindex,follow","string","How should spiders crawl us? (see http://www.r
obotstxt.org/wc/meta-user.html for more info).",NULL),
                "rss.config.serverpush"         =>              array("true","tr
ue","boolean","Use the server push method when updating your feeds in the browse
r. The browsers that support this (Mozilla and Opera) will be autodetected. Turn
 this option off if you do not use one of these browsers or if you would like to
 use the Ajax update method",NULL),
                "rss.config.refreshafter"       =>              array("45","45",
"num","If this option is set the feeds will be updated after keeping the browser
 open for x minutes. Please respect the feed providers by not setting this value
 to anything lower than thirty minutes. Set this variable to 0 turn this option 
off.",NULL),
--- 440,445 ----
diff -rc ./util.php /tmp/gregarius/util.php
*** ./util.php  2006-03-20 13:07:12.000000000 +0000
--- /tmp/gregarius/util.php     2006-03-18 21:42:02.000000000 +0000
***************
*** 76,95 ****
      $host = $url_parts["host"];
      $port = (array_key_exists('port', $url_parts) ? $url_parts["port"] : "80")
;
  
!     if (($prx = getConfig('rss.config.proxy')) != '') {
!         $getcall = 'GET http://'.$host.':'.$port.$documentpath.' HTTP/1.1';
!         $socket = @ fsockopen($prx, getConfig('rss.config.proxyport'), $errno,
 $errstr, 30);
!     } else {
!         $getcall = 'GET '.$documentpath.' HTTP/1.0';
!         $socket = @ fsockopen($host, $port, $errno, $errstr, 30);
!     }
! 
      if (!$socket) {
          return (false);
      }
  
      $ret = false;
!     fwrite($socket, $getcall."\r\nHost: ".$host."\r\n\r\n");
      while (!feof($socket)) {
          $line = fgets($socket, 100);
          if (preg_match("/Content-Type: (.*)/i", $line, $matches)) {
--- 76,88 ----
      $host = $url_parts["host"];
      $port = (array_key_exists('port', $url_parts) ? $url_parts["port"] : "80")
;
  
!     $socket = @ fsockopen($host, $port, $errno, $errstr, 30);
      if (!$socket) {
          return (false);
      }
  
      $ret = false;
!     fwrite($socket, "GET ".$documentpath." HTTP/1.0\r\nHost: $host\r\n\r\n");
      while (!feof($socket)) {
          $line = fgets($socket, 100);
          if (preg_match("/Content-Type: (.*)/i", $line, $matches)) {
***************
*** 693,702 ****
      $client = new Snoopy();
      $client->agent = MAGPIE_USER_AGENT;
      $client->use_gzip = getConfig('rss.output.compression');
-     if (($prx = getConfig('rss.config.proxy')) != '') {
-         $client->proxy_host = $prx;
-         $client->proxy_port = getConfig('rss.config.proxyport');
-     }
  
      if ($maxlen) {
          $client->maxlength = $maxlen;
--- 686,691 ----