diff options
Diffstat (limited to 'src/fastcgi.cpp')
| -rw-r--r-- | src/fastcgi.cpp | 22 | 
1 files changed, 11 insertions, 11 deletions
| diff --git a/src/fastcgi.cpp b/src/fastcgi.cpp index 8168928..ca3010e 100644 --- a/src/fastcgi.cpp +++ b/src/fastcgi.cpp | |||
| @@ -24,14 +24,14 @@ Bu::FastCgi::FastCgi() : | |||
| 24 | pSrv( NULL ), | 24 | pSrv( NULL ), | 
| 25 | bRunning( true ) | 25 | bRunning( true ) | 
| 26 | { | 26 | { | 
| 27 | pSrv = new Bu::ServerSocket( STDIN_FILENO, false ); | 27 | pSrv = new Bu::TcpServerSocket( STDIN_FILENO, false ); | 
| 28 | } | 28 | } | 
| 29 | 29 | ||
| 30 | Bu::FastCgi::FastCgi( int iPort ) : | 30 | Bu::FastCgi::FastCgi( int iPort ) : | 
| 31 | pSrv( NULL ), | 31 | pSrv( NULL ), | 
| 32 | bRunning( true ) | 32 | bRunning( true ) | 
| 33 | { | 33 | { | 
| 34 | pSrv = new Bu::ServerSocket( iPort ); | 34 | pSrv = new Bu::TcpServerSocket( iPort ); | 
| 35 | } | 35 | } | 
| 36 | 36 | ||
| 37 | Bu::FastCgi::~FastCgi() | 37 | Bu::FastCgi::~FastCgi() | 
| @@ -64,17 +64,17 @@ bool Bu::FastCgi::isEmbedded() | |||
| 64 | #endif | 64 | #endif | 
| 65 | } | 65 | } | 
| 66 | 66 | ||
| 67 | void Bu::FastCgi::read( Bu::Socket &s, Bu::FastCgi::Record &r ) | 67 | void Bu::FastCgi::read( Bu::TcpSocket &s, Bu::FastCgi::Record &r ) | 
| 68 | { | 68 | { | 
| 69 | int iRead = s.read( &r, sizeof(Record) ); | 69 | int iRead = s.read( &r, sizeof(Record) ); | 
| 70 | if( iRead != sizeof(Record) ) | 70 | if( iRead != sizeof(Record) ) | 
| 71 | throw Bu::SocketException("Hey, the size %d is wrong for Record. (%s)", | 71 | throw Bu::TcpSocketException("Hey, the size %d is wrong for Record. (%s)", | 
| 72 | iRead, strerror( errno ) ); | 72 | iRead, strerror( errno ) ); | 
| 73 | r.uRequestId = ntohs( r.uRequestId ); | 73 | r.uRequestId = ntohs( r.uRequestId ); | 
| 74 | r.uContentLength = ntohs( r.uContentLength ); | 74 | r.uContentLength = ntohs( r.uContentLength ); | 
| 75 | } | 75 | } | 
| 76 | 76 | ||
| 77 | void Bu::FastCgi::write( Bu::Socket &s, Bu::FastCgi::Record r ) | 77 | void Bu::FastCgi::write( Bu::TcpSocket &s, Bu::FastCgi::Record r ) | 
| 78 | { | 78 | { | 
| 79 | // sio << "Out -> " << r << sio.nl; | 79 | // sio << "Out -> " << r << sio.nl; | 
| 80 | r.uRequestId = htons( r.uRequestId ); | 80 | r.uRequestId = htons( r.uRequestId ); | 
| @@ -82,19 +82,19 @@ void Bu::FastCgi::write( Bu::Socket &s, Bu::FastCgi::Record r ) | |||
| 82 | s.write( &r, sizeof(Record) ); | 82 | s.write( &r, sizeof(Record) ); | 
| 83 | } | 83 | } | 
| 84 | 84 | ||
| 85 | void Bu::FastCgi::read( Bu::Socket &s, Bu::FastCgi::BeginRequestBody &b ) | 85 | void Bu::FastCgi::read( Bu::TcpSocket &s, Bu::FastCgi::BeginRequestBody &b ) | 
| 86 | { | 86 | { | 
| 87 | s.read( &b, sizeof(BeginRequestBody) ); | 87 | s.read( &b, sizeof(BeginRequestBody) ); | 
| 88 | b.uRole = ntohs( b.uRole ); | 88 | b.uRole = ntohs( b.uRole ); | 
| 89 | } | 89 | } | 
| 90 | 90 | ||
| 91 | void Bu::FastCgi::write( Bu::Socket &s, Bu::FastCgi::EndRequestBody b ) | 91 | void Bu::FastCgi::write( Bu::TcpSocket &s, Bu::FastCgi::EndRequestBody b ) | 
| 92 | { | 92 | { | 
| 93 | b.uStatus = htonl( b.uStatus ); | 93 | b.uStatus = htonl( b.uStatus ); | 
| 94 | s.write( &b, sizeof(b) ); | 94 | s.write( &b, sizeof(b) ); | 
| 95 | } | 95 | } | 
| 96 | 96 | ||
| 97 | uint32_t Bu::FastCgi::readLen( Bu::Socket &s, uint16_t &uRead ) | 97 | uint32_t Bu::FastCgi::readLen( Bu::TcpSocket &s, uint16_t &uRead ) | 
| 98 | { | 98 | { | 
| 99 | uint8_t uByte[4]; | 99 | uint8_t uByte[4]; | 
| 100 | s.read( uByte, 1 ); | 100 | s.read( uByte, 1 ); | 
| @@ -107,7 +107,7 @@ uint32_t Bu::FastCgi::readLen( Bu::Socket &s, uint16_t &uRead ) | |||
| 107 | return ((uByte[0]&0x7f)<<24)|(uByte[1]<<16)|(uByte[2]<<8)|(uByte[3]); | 107 | return ((uByte[0]&0x7f)<<24)|(uByte[1]<<16)|(uByte[2]<<8)|(uByte[3]); | 
| 108 | } | 108 | } | 
| 109 | 109 | ||
| 110 | void Bu::FastCgi::readPair( Bu::Socket &s, StrHash &hParams, uint16_t &uRead ) | 110 | void Bu::FastCgi::readPair( Bu::TcpSocket &s, StrHash &hParams, uint16_t &uRead ) | 
| 111 | { | 111 | { | 
| 112 | uint32_t uName = readLen( s, uRead ); | 112 | uint32_t uName = readLen( s, uRead ); | 
| 113 | uint32_t uValue = readLen( s, uRead ); | 113 | uint32_t uValue = readLen( s, uRead ); | 
| @@ -162,7 +162,7 @@ void Bu::FastCgi::run() | |||
| 162 | if( iSock < 0 ) | 162 | if( iSock < 0 ) | 
| 163 | continue; | 163 | continue; | 
| 164 | 164 | ||
| 165 | Bu::Socket s( iSock ); | 165 | Bu::TcpSocket s( iSock ); | 
| 166 | s.setBlocking( true ); | 166 | s.setBlocking( true ); | 
| 167 | // sio << "Got connection, blocking? " << s.isBlocking() << sio.nl; | 167 | // sio << "Got connection, blocking? " << s.isBlocking() << sio.nl; | 
| 168 | try | 168 | try | 
| @@ -362,7 +362,7 @@ void Bu::FastCgi::run() | |||
| 362 | } | 362 | } | 
| 363 | } | 363 | } | 
| 364 | } | 364 | } | 
| 365 | catch( Bu::SocketException &e ) | 365 | catch( Bu::TcpSocketException &e ) | 
| 366 | { | 366 | { | 
| 367 | // sio << "Bu::SocketException: " << e.what() << sio.nl << | 367 | // sio << "Bu::SocketException: " << e.what() << sio.nl << | 
| 368 | // "\tSocket open: " << s.isOpen() << sio.nl; | 368 | // "\tSocket open: " << s.isOpen() << sio.nl; | 
