Merged in the core branch. This is a major update that fixes many things, and

changes many others, including source files that were deleted and renamed.

Before doing this update, I reccomend a full clean, or even a fresh checkout.

Things to note, most outstanding about this update:
 - Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
 - All templatized container classes are SharedCore now, which is good, but
   SharedCore is inherently non-reentrant safe.  However, all SharedCore classes
   have a "clone" function that return a non-shared copy of the object, safe for
   passing into a reentrant safe function accessing shared memory.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/fastcgi.h b/src/fastcgi.h
index 262872c..7c1c04c 100644
--- a/src/fastcgi.h
+++ b/src/fastcgi.h
@@ -11,8 +11,8 @@
 #include "bu/fstring.h"
 #include "bu/hash.h"
 #include "bu/array.h"
-#include "bu/socket.h"
-#include "bu/serversocket.h"
+#include "bu/tcpsocket.h"
+#include "bu/tcpserversocket.h"
 
 namespace Bu
 {
@@ -109,18 +109,18 @@ namespace Bu
                 virtual void onUninit() { };
 
         private:
-                void read( Bu::Socket &s, Record &r );
-                void read( Bu::Socket &s, BeginRequestBody &b );
-                uint32_t readLen( Bu::Socket &s, uint16_t &uUsed );
-                void readPair( Bu::Socket &s, StrHash &hParams, uint16_t &uUsed );
+                void read( Bu::TcpSocket &s, Record &r );
+                void read( Bu::TcpSocket &s, BeginRequestBody &b );
+                uint32_t readLen( Bu::TcpSocket &s, uint16_t &uUsed );
+                void readPair( Bu::TcpSocket &s, StrHash &hParams, uint16_t &uUsed );
 
-                void write( Bu::Socket &s, Record r );
-                void write( Bu::Socket &s, EndRequestBody b );
+                void write( Bu::TcpSocket &s, Record r );
+                void write( Bu::TcpSocket &s, EndRequestBody b );
 
                 bool hasChannel( int iChan );
 
         private:
-                Bu::ServerSocket *pSrv;
+                Bu::TcpServerSocket *pSrv;
                 bool bRunning;
                 Bu::Array<Channel *> aChannel;
         };