// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.cc,v 1.10 1998/12/07 07:26:27 jgg Exp $
+// $Id: http.cc,v 1.39 1999/10/18 03:18:40 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
#include <unistd.h>
#include <signal.h>
#include <stdio.h>
+#include <errno.h>
// Internet stuff
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
#include <netdb.h>
+#include "connect.h"
+#include "rfc2553emu.h"
#include "http.h"
+
/*}}}*/
string HttpMethod::FailFile;
int HttpMethod::FailFd = -1;
time_t HttpMethod::FailTime = 0;
-unsigned long PipelineDepth = 5;
+unsigned long PipelineDepth = 10;
+unsigned long TimeOut = 120;
+bool Debug = false;
// CircleBuf::CircleBuf - Circular input buffer /*{{{*/
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
/* */
ServerState::ServerState(URI Srv,HttpMethod *Owner) : Owner(Owner),
- In(64*1024), Out(1*1024),
+ In(64*1024), Out(4*1024),
ServerName(Srv)
{
Reset();
// ---------------------------------------------------------------------
/* This opens a connection to the server. */
string LastHost;
-in_addr LastHostA;
+int LastPort = 0;
+struct addrinfo *LastHostAddr = 0;
bool ServerState::Open()
{
// Use the already open connection if possible.
else
Proxy = getenv("http_proxy");
+ // Parse no_proxy, a , seperated list of hosts
+ if (getenv("no_proxy") != 0)
+ {
+ const char *Start = getenv("no_proxy");
+ for (const char *Cur = Start; true ; Cur++)
+ {
+ if (*Cur != ',' && *Cur != 0)
+ continue;
+ if (stringcasecmp(ServerName.Host.begin(),ServerName.Host.end(),
+ Start,Cur) == 0)
+ {
+ Proxy = "";
+ break;
+ }
+
+ Start = Cur + 1;
+ if (*Cur == 0)
+ break;
+ }
+ }
+
// Determine what host and port to use based on the proxy settings
- int Port = 80;
+ int Port = 0;
string Host;
if (Proxy.empty() == true)
{
Host = Proxy.Host;
}
- /* We used a cached address record.. Yes this is against the spec but
- the way we have setup our rotating dns suggests that this is more
- sensible */
- if (LastHost != Host)
- {
- Owner->Status("Connecting to %s",Host.c_str());
-
- // Lookup the host
- hostent *Addr = gethostbyname(Host.c_str());
- if (Addr == 0)
- return _error->Error("Could not resolve '%s'",Host.c_str());
- LastHost = Host;
- LastHostA = *(in_addr *)(Addr->h_addr_list[0]);
- }
-
- Owner->Status("Connecting to %s (%s)",Host.c_str(),inet_ntoa(LastHostA));
-
- // Get a socket
- if ((ServerFd = socket(AF_INET,SOCK_STREAM,0)) < 0)
- return _error->Errno("socket","Could not create a socket");
+ // Connect to the remote server
+ if (Connect(Host,Port,"http",80,ServerFd,TimeOut,Owner) == false)
+ return false;
- // Connect to the server
- struct sockaddr_in server;
- server.sin_family = AF_INET;
- server.sin_port = htons(Port);
- server.sin_addr = LastHostA;
- if (connect(ServerFd,(sockaddr *)&server,sizeof(server)) < 0)
- return _error->Errno("socket","Could not create a socket");
-
- SetNonBlock(ServerFd,true);
return true;
}
/*}}}*/
while ((Last = Owner->Go(false,this)) == true);
if (Last == false)
return false;
- return true;
+ return !_error->PendingError();
}
// Transfer the block
continue;
In.Limit(-1);
- return true;
+ return !_error->PendingError();
}
while (Owner->Go(true,this) == true);
}
- return Owner->Flush(this);
+ return Owner->Flush(this) && !_error->PendingError();
}
/*}}}*/
// ServerState::HeaderLine - Process a header line /*{{{*/
{
if (Line.empty() == true)
return true;
-
+
// The http server might be trying to do something evil.
if (Line.length() >= MAXLEN)
return _error->Error("Got a single header line over %u chars",MAXLEN);
string::size_type Pos = Line.find(' ');
if (Pos == string::npos || Pos+1 > Line.length())
- return _error->Error("Bad header line");
-
- string Tag = string(Line,0,Pos);
- string Val = string(Line,Pos+1);
+ {
+ // Blah, some servers use "connection:closes", evil.
+ Pos = Line.find(':');
+ if (Pos == string::npos || Pos + 2 > Line.length())
+ return _error->Error("Bad header line");
+ Pos++;
+ }
+ // Parse off any trailing spaces between the : and the next word.
+ string::size_type Pos2 = Pos;
+ while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
+ Pos2++;
+
+ string Tag = string(Line,0,Pos);
+ string Val = string(Line,Pos2);
+
if (stringcasecmp(Tag.begin(),Tag.begin()+4,"HTTP") == 0)
{
// Evil servers return no version
and we expect the proxy to do this */
if (Proxy.empty() == true)
sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\nConnection: keep-alive\r\n",
- Uri.Path.c_str(),ProperHost.c_str());
+ QuoteString(Uri.Path,"~").c_str(),ProperHost.c_str());
else
{
/* Generate a cache control header if necessary. We place a max
sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
Itm->Uri.c_str(),ProperHost.c_str());
if (_config->FindB("Acquire::http::No-Cache",false) == true)
- strcat(Buf,"Cache-Control: no-cache\r\n");
+ strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
else
{
if (Itm->IndexFile == true)
}
}
-/* if (ProxyAuth.empty() == false)
- Req += string("Proxy-Authorization: Basic ") + Base64Encode(ProxyAuth) + "\r\n";*/
+ if (Proxy.User.empty() == false || Proxy.Password.empty() == false)
+ Req += string("Proxy-Authorization: Basic ") +
+ Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
Req += "User-Agent: Debian APT-HTTP/1.2\r\n\r\n";
-// cerr << Req << endl;
+
+ if (Debug == true)
+ cerr << Req << endl;
- cerr << Req << endl;
Out.Read(Req);
}
/*}}}*/
bool HttpMethod::Go(bool ToFile,ServerState *Srv)
{
// Server has closed the connection
- if (Srv->ServerFd == -1 && Srv->In.WriteSpace() == false)
+ if (Srv->ServerFd == -1 && (Srv->In.WriteSpace() == false ||
+ ToFile == false))
return false;
fd_set rfds,wfds,efds;
int MaxFd = FileFD;
if (MaxFd < Srv->ServerFd)
MaxFd = Srv->ServerFd;
-
+
// Select
struct timeval tv;
- tv.tv_sec = 120;
+ tv.tv_sec = TimeOut;
tv.tv_usec = 0;
int Res = 0;
if ((Res = select(MaxFd+1,&rfds,&wfds,&efds,&tv)) < 0)
// Handle commands from APT
if (FD_ISSET(STDIN_FILENO,&rfds))
{
- if (Run(true) != 0)
+ if (Run(true) != -1)
exit(100);
}
/* */
bool HttpMethod::ServerDie(ServerState *Srv)
{
+ unsigned int LErrno = errno;
+
// Dump the buffer to the file
if (Srv->State == ServerState::Data)
{
if (Srv->In.IsLimit() == false && Srv->State != ServerState::Header &&
Srv->Encoding != ServerState::Closes)
{
- if (errno == 0)
+ Srv->Close();
+ if (LErrno == 0)
return _error->Error("Error reading from server Remote end closed connection");
+ errno = LErrno;
return _error->Errno("read","Error reading from server");
}
else
return 5;
FailFile = Queue->DestFile;
+ FailFile.c_str(); // Make sure we dont do a malloc in the signal handler
FailFd = File->Fd();
FailTime = Srv->Date;
// Timestamp
struct utimbuf UBuf;
- time(&UBuf.actime);
UBuf.actime = FailTime;
UBuf.modtime = FailTime;
utime(FailFile.c_str(),&UBuf);
{
if (Server == 0)
return true;
-
+
// Queue the requests
int Depth = -1;
bool Tail = false;
// Make sure we stick with the same server
if (Server->Comp(I->Uri) == false)
break;
-
if (QueueBack == I)
Tail = true;
if (Tail == true)
{
- Depth++;
QueueBack = I->Next;
SendReq(I,Server->Out);
continue;
return true;
};
/*}}}*/
+// HttpMethod::Configuration - Handle a configuration message /*{{{*/
+// ---------------------------------------------------------------------
+/* We stash the desired pipeline depth */
+bool HttpMethod::Configuration(string Message)
+{
+ if (pkgAcqMethod::Configuration(Message) == false)
+ return false;
+
+ TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut);
+ PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
+ PipelineDepth);
+ Debug = _config->FindB("Debug::Acquire::http",false);
+
+ return true;
+}
+ /*}}}*/
// HttpMethod::Loop - Main loop /*{{{*/
// ---------------------------------------------------------------------
/* */
int FailCounter = 0;
while (1)
- {
- if (FailCounter >= 2)
- {
- Fail("Massive Server Brain Damage");
- FailCounter = 0;
- }
-
+ {
// We have no commands, wait for some to arrive
if (Queue == 0)
{
return 0;
}
- // Run messages
- if (Run(true) != 0)
+ /* Run messages, we can accept 0 (no message) if we didn't
+ do a WaitFd above.. Otherwise the FD is closed. */
+ int Result = Run(true);
+ if (Result != -1 && (Result != 0 || Queue == 0))
return 100;
if (Queue == 0)
Server = new ServerState(Queue->Uri,this);
}
+ // Reset the pipeline
+ if (Server->ServerFd == -1)
+ QueueBack = Queue;
+
// Connnect to the host
if (Server->Open() == false)
{
- Fail();
+ Fail(true);
+ delete Server;
+ Server = 0;
continue;
}
case 2:
{
_error->Error("Bad header Data");
- Fail();
+ Fail(true);
continue;
}
case 1:
{
FailCounter++;
- _error->DumpErrors();
+ _error->Discard();
Server->Close();
+
+ if (FailCounter >= 2)
+ {
+ Fail("Connection failed",true);
+ FailCounter = 0;
+ }
+
continue;
}
};
URIDone(Res);
}
else
- Fail();
+ Fail(true);
break;
}
projects / apt.git / blobdiff