[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-55-g
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-55-g38827a0 |
|
Date: |
Wed, 10 Feb 2010 16:27:42 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 38827a01d9360f56ba99e0e866985883506a4d78 (commit)
via 80b5a9246fc23c297854945a678ac5d28c6b0b40 (commit)
via 3ac10e92c270d62bfa0d44028d2f49c27ea00c72 (commit)
via 506db9b0068fee4c8777fea6d953f13fe9c45858 (commit)
via 6a5c898f27b342c6cbcccf8bb394396aa92e8535 (commit)
via e7313d7c92e16be37e7386eef8c46da0e485dd9f (commit)
from 04bbfafe6dc25628398e64090d1f194acd2ce772 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 38827a01d9360f56ba99e0e866985883506a4d78
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 17:24:16 2010 +0100
Remove SOCKET_ERROR definition
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 279013d..748aacf 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -50,10 +50,6 @@ extern "C"
typedef void* HANDLE;
-#ifndef SOCKET_ERROR
-# define SOCKET_ERROR -1
-#endif
-
#endif
extern "C"
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index a0bf313..93b60be 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -807,7 +807,7 @@ DEFINE_THREAD (SendAsciiFile, pParam)
}
if (pFtpuserData->m_pDataConnection->socket->
send (auxiliaryBuffer.getBuffer (),
- (u_long) auxiliaryBuffer.getLength (), 0) == SOCKET_ERROR)
+ (u_long) auxiliaryBuffer.getLength (), 0) < 0)
{
ftpReply (pConnection, 451);
file->close ();
@@ -983,15 +983,15 @@ DEFINE_THREAD (SendImageFile, pParam)
auxiliaryBuffer.setRealLength (1024);
while (filesize != 0)
{
+ Socket *socket = pFtpuserData->m_pDataConnection->socket;
nBufferSize =
std::min (static_cast < u_long > (filesize),
static_cast < u_long >
(auxiliaryBuffer.getRealLength () / 2));
if (file->read (auxiliaryBuffer.getBuffer (), nBufferSize, &nbr)
- || pFtpuserData->m_pDataConnection->socket->send
(auxiliaryBuffer.getBuffer (),
-
(u_long)nBufferSize, 0)
- == SOCKET_ERROR)
+ || socket->send (auxiliaryBuffer.getBuffer (),
+ (u_long) nBufferSize, 0) < 0)
{
ftpReply (pConnection, 451);
file->close ();
@@ -1163,9 +1163,10 @@ DEFINE_THREAD (ReceiveAsciiFile, pParam)
int nLineLength = 0;
std::string sLine;
u_long nbr;
- while (pFtpuserData->m_pDataConnection->socket->read (buffer.getBuffer
(),
- (u_long)
buffer.getRealLength () - 1, &nbr)
- != SOCKET_ERROR && nbr != 0)
+ Socket *socket = pFtpuserData->m_pDataConnection->socket;
+ while (!socket->read (buffer.getBuffer (),
+ (u_long) buffer.getRealLength () - 1, &nbr)
+ && nbr != 0)
{
memset (auxiliaryBuffer.getBuffer (), 0,
auxiliaryBuffer.getRealLength ());
@@ -1356,12 +1357,10 @@ DEFINE_THREAD (ReceiveImageFile, pParam)
MemBuf buffer;
buffer.setRealLength (1024);
memset (buffer.getBuffer (), 0, buffer.getRealLength ());
- while (pFtpuserData->m_pDataConnection->socket->read (buffer.getBuffer
(),
- (u_long) buffer.
- getRealLength () -
- 1,
- &nbr) !=
- SOCKET_ERROR && nbr != 0)
+ Socket *socket = pFtpuserData->m_pDataConnection->socket;
+ while (!socket->read (buffer.getBuffer (),
+ (u_long) buffer.getRealLength () - 1,
+ &nbr) && nbr != 0)
{
file.write (buffer.getBuffer (), nbr, &nbr);
if (pFtpuserData->m_bBreakDataConnection)
@@ -1876,7 +1875,7 @@ Ftp::list (const std::string & sParam /*= ""*/ )
if (pFtpuserData->m_pDataConnection->socket->
send (td.auxiliaryBuffer->getBuffer (),
- (u_long) td.auxiliaryBuffer->getLength (), 0) == SOCKET_ERROR)
+ (u_long) td.auxiliaryBuffer->getLength (), 0) < 0)
{
ftpReply (451);
}
@@ -1947,7 +1946,7 @@ Ftp::nlst (const std::string & sParam /* = "" */ )
if (pFtpuserData->m_pDataConnection->socket->
send (td.auxiliaryBuffer->getBuffer (),
- (u_long) td.auxiliaryBuffer->getLength (), 0) == SOCKET_ERROR)
+ (u_long) td.auxiliaryBuffer->getLength (), 0) < 0)
{
ftpReply (451);
}
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 69fb371..2c0cdb5 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -164,7 +164,7 @@ int Http::optionsHTTPRESOURCE (string& filename, int
yetmapped)
/* Send the HTTP header. */
ret = td->connection->socket->send (td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
0);
- if (ret == SOCKET_ERROR)
+ if (ret < 0)
{
td->connection->host->warningsLogWrite (_("HTTP: socket error"));
return 0;
@@ -215,7 +215,7 @@ int Http::traceHTTPRESOURCE (string& filename, int
yetmapped)
/* Send our HTTP header. */
ret = td->connection->socket->send (td->auxiliaryBuffer->getBuffer (),
(u_long)
td->auxiliaryBuffer->getLength (), 0);
- if (ret == SOCKET_ERROR)
+ if (ret < 0)
{
td->connection->host->warningsLogWrite (_("HTTP: socket error"));
return 0;
@@ -224,7 +224,7 @@ int Http::traceHTTPRESOURCE (string& filename, int
yetmapped)
/* Send the client request header as the HTTP body. */
ret = td->connection->socket->send (td->buffer->getBuffer (),
contentLength, 0);
- if (ret == SOCKET_ERROR)
+ if (ret < 0)
{
td->connection->host->warningsLogWrite (_("HTTP: socket error"));
return 0;
commit 80b5a9246fc23c297854945a678ac5d28c6b0b40
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 17:19:52 2010 +0100
Remove INVALID_SOCKET definition
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index c2b757a..34dde60 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -44,9 +44,6 @@ extern "C"
# include <stdio.h>
# include <unistd.h>
}
-
-# define INVALID_SOCKET -1
-# define SD_BOTH SHUT_RDWR
# endif
typedef int SocketHandle;
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 13e5af5..279013d 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -54,10 +54,6 @@ typedef void* HANDLE;
# define SOCKET_ERROR -1
#endif
-#ifndef INVALID_SOCKET
-# define INVALID_SOCKET -1
-#endif
-
#endif
extern "C"
diff --git a/myserver/src/base/process/fork_server.cpp
b/myserver/src/base/process/fork_server.cpp
index ab8be8b..e0c975f 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -404,7 +404,7 @@ int ForkServer::generateListenerSocket (Socket &socket,
u_short *port)
socket.socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (socket.getHandle () == (Handle)INVALID_SOCKET)
+ if (socket.getHandle () < 0)
return -1;
MYSERVER_SOCKADDR_STORAGE sockaddr = { 0 };
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index 7cba6b2..13c39b2 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -481,7 +481,7 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
server->socket.socket (AF_INET, SOCK_STREAM, 0);
- if (server->socket.getHandle () == (Handle)INVALID_SOCKET)
+ if (server->socket.getHandle () < 0)
return 1;
((sockaddr_in *)(&serverSockAddrIn))->sin_family = AF_INET;
diff --git a/myserver/src/connections_scheduler/listen_threads.cpp
b/myserver/src/connections_scheduler/listen_threads.cpp
index b8d5ff0..43fe9b1 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -92,7 +92,7 @@ int ListenThreads::createServerAndListener (u_short port)
if (serverSocketIPv4 != NULL)
{
serverSocketIPv4->socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (serverSocketIPv4->getHandle () == (Handle)INVALID_SOCKET)
+ if (serverSocketIPv4->getHandle () < 0)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
@@ -146,7 +146,7 @@ int ListenThreads::createServerAndListener (u_short port)
if (serverSocketIPv6 != NULL)
{
serverSocketIPv6->socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
- if (serverSocketIPv6->getHandle () == (FileHandle)INVALID_SOCKET)
+ if (serverSocketIPv6->getHandle () < 0)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index 13e0852..a0bf313 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -543,7 +543,7 @@ void Ftp::pasv ()
asockInLen = sizeof (sockaddr_in);
asock = pFtpuserData->m_pDataConnection->socket->accept (&asockIn,
&asockInLen);
- if (asock->getHandle () == (Handle) INVALID_SOCKET)
+ if (asock->getHandle () < 0)
return;
pFtpuserData->m_pDataConnection->socket->shutdown (SD_BOTH);
@@ -1530,8 +1530,9 @@ Ftp::openDataPassive ()
Socket *pSocket = new Socket ();
pSocket->socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (pSocket->getHandle () == (Handle) INVALID_SOCKET)
+ if (pSocket->getHandle () < 0)
return 0;
+
int nReuseAddr = 1;
MYSERVER_SOCKADDR_STORAGE storage = { 0 };
((sockaddr_in *) (&storage))->sin_family = AF_INET;
commit 3ac10e92c270d62bfa0d44028d2f49c27ea00c72
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 17:14:52 2010 +0100
Fix compiler warnings
diff --git a/myserver/include/base/slab/slab.h
b/myserver/include/base/slab/slab.h
index 7a96802..12644a1 100644
--- a/myserver/include/base/slab/slab.h
+++ b/myserver/include/base/slab/slab.h
@@ -60,7 +60,7 @@ public:
{
int i = mask.find ();
- if (i == -1 || i >= capacity)
+ if (i == -1 || static_cast <u_long> (i) >= capacity)
return NULL;
mask.unset (i);
diff --git a/myserver/include/protocol/ftp/ftp.h
b/myserver/include/protocol/ftp/ftp.h
index 19a9259..9bc982e 100644
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -233,8 +233,6 @@ public:
u_long tid)
{
Ftp ftp;
- int ret = 0;
-
return ftp.controlConnection (con, request, auxBuf, reqBufLen, auxBufLen,
reqLen, tid);
}
diff --git a/myserver/src/base/bitvec/bitvec.cpp
b/myserver/src/base/bitvec/bitvec.cpp
index 5425204..43a9f2c 100644
--- a/myserver/src/base/bitvec/bitvec.cpp
+++ b/myserver/src/base/bitvec/bitvec.cpp
@@ -63,8 +63,8 @@ void BitVec::init (int capacity, bool val)
this->data[i] = 0;
if (val)
- for (u_long i = 0; i < capacity; i++)
- set (i);
+ for (int i = 0; i < capacity; i++)
+ set (static_cast <u_long> (i));
lastFound = 0;
}
@@ -79,10 +79,10 @@ void BitVec::init (int capacity, bool val)
int BitVec::ffs ()
{
int p = 0;
- for (int i = 0; i < dataSize; i++)
- if (p = ffsl (data[i]))
+ for (u_long i = 0; i < dataSize; i++)
+ if ((p = ffsl (data[i])))
{
- int r = (i * sizeof (long int) * 8) + p - 1;
+ u_long r = (i * sizeof (long int) * 8) + p - 1;
if (r < capacity)
return r;
}
@@ -105,10 +105,10 @@ int BitVec::find ()
{
int p = 0;
- for (int i = lastFound; i < dataSize + lastFound; i++)
- if (p = ffsl (data[i % dataSize]))
+ for (u_long i = lastFound; i < dataSize + lastFound; i++)
+ if ((p = ffsl (data[i % dataSize])))
{
- int r = (i * sizeof (long int) * 8) + p - 1;
+ u_long r = (i * sizeof (long int) * 8) + p - 1;
if (r < capacity)
{
lastFound = i;
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 83c645c..cc91636 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -139,11 +139,9 @@ int File::truncate (u_long size)
*/
int File::openFile (const char* nfilename,u_long opt)
{
- long ret = 0;
struct stat fStats;
int flags;
-
filename.assign (nfilename);
if ((opt & File::READ) && (opt & File::WRITE))
@@ -373,7 +371,7 @@ int File::fastCopyToSocket (Socket *dest, u_long firstByte,
MemBuf *buf, u_long
*nbw += ret;
- if (fileSize == offset)
+ if (fileSize == (size_t) offset)
return 0;
}
@@ -401,7 +399,7 @@ int File::fastCopyToSocket (Socket *dest, u_long firstByte,
MemBuf *buf, u_long
*nbw += tmpNbw;
}
+#endif
return 0;
-#endif
}
diff --git a/myserver/src/base/file/files_utility.cpp
b/myserver/src/base/file/files_utility.cpp
index ca18a92..971aa9b 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -155,8 +155,6 @@ int FilesUtility::copyFile (const char* src, const char*
dest, int overwrite)
{
File srcFile;
File destFile;
- char buffer[4096];
- size_t dim;
if (srcFile.openFile (src, File::READ))
return -1;
@@ -377,8 +375,7 @@ int FilesUtility::chown (const char* filename, string &uid,
string &gid)
*/
int FilesUtility::getFilenameLength (const char *path, int *filename)
{
- int splitpoint, i = 0, j = 0;
- splitpoint = static_cast<int>(strlen (path) - 1);
+ int splitpoint = static_cast<int> (strlen (path) - 1);
while ((splitpoint > 0) && (path[splitpoint] != '/'))
splitpoint--;
*filename = splitpoint + 1;
diff --git a/myserver/src/base/process/fork_server.cpp
b/myserver/src/base/process/fork_server.cpp
index 39c7404..ab8be8b 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -97,10 +97,10 @@ int ForkServer::readInt (Socket *sock, int *dest)
*/
int ForkServer::readString (Socket *sock, char **out)
{
- int len;
+ u_long len;
u_long nbr;
- if (sock->read ((char*)&len, 4, &nbr) || nbr < 4)
+ if (sock->read ((char*) &len, 4, &nbr) || nbr < 4)
{
return -1;
}
@@ -123,7 +123,7 @@ int ForkServer::readString (Socket *sock, char **out)
int ForkServer::handleRequest (Socket *sock)
{
#ifndef WIN32
- int ret, flags, stdIn = -1, stdOut = -1, stdErr = -1;
+ int flags, stdIn = -1, stdOut = -1, stdErr = -1;
char *gid, *uid;
int stdInPort = 0;
char *exec;
diff --git a/myserver/src/base/process/process.cpp
b/myserver/src/base/process/process.cpp
index 0e54502..a6932f8 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -83,7 +83,7 @@ int Process::generateArgList (const char **args, size_t size,
const char *proc,
args[0] = proc;
const char *arg = additionalArgs.c_str ();
- int count = 1;
+ u_long count = 1;
int len = additionalArgs.length ();
int start = 0;
@@ -331,7 +331,7 @@ uid_t Process::getUid (const char *user)
{
uid_t uid = atol (user);
- if (uid >= 0 && uid <= MAXUID)
+ if (uid >= 0L && uid <= (uid_t) MAXUID)
return uid;
}
@@ -357,7 +357,7 @@ gid_t Process::getGid (const char *grp)
{
gid_t gid = atol (grp);
- if (gid >= 0 && gid <= MAXGID)
+ if (gid >= 0L && gid <= (gid_t) MAXGID)
return gid;
}
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index 1959ae4..7cba6b2 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -270,7 +270,6 @@ void ProcessServerManager::addServer
(ProcessServerManager::Server* server,
const char* domain, const char* name)
{
ServerDomain *sd = createDomain (domain);
- Server *old;
string strName (name);
mutex.lock ();
diff --git a/myserver/src/conf/security/xml_validator.cpp
b/myserver/src/conf/security/xml_validator.cpp
index 19d0e17..d8ca272 100644
--- a/myserver/src/conf/security/xml_validator.cpp
+++ b/myserver/src/conf/security/xml_validator.cpp
@@ -74,9 +74,7 @@ XmlParser* XmlValidator::getParser (SecurityToken* st)
secName = st->getData ("security.filename", MYSERVER_VHOST_CONF
| MYSERVER_SERVER_CONF, ".security.xml");
- u_long maxSize = atol (st->getData ("security.max_size", MYSERVER_VHOST_CONF
- | MYSERVER_SERVER_CONF, "0"));
-
+ /*TODO: check that file size is not bigger than "security.max_size". */
return cache->getParser (*(st->getDirectory ()), *(st->getSysDirectory ()),
false, secName);
}
diff --git a/myserver/src/connection/connection.cpp
b/myserver/src/connection/connection.cpp
index de96d65..ebee461 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -53,10 +53,6 @@ void Connection::destroy ()
if (socket)
{
socket->shutdown (SD_BOTH);
- char buffer[256];
- int buffersize = 256;
- int err;
-
socket->close ();
delete socket;
socket = NULL;
diff --git a/myserver/src/filter/gzip/gzip.cpp
b/myserver/src/filter/gzip/gzip.cpp
index 22f5008..da118f9 100644
--- a/myserver/src/filter/gzip/gzip.cpp
+++ b/myserver/src/filter/gzip/gzip.cpp
@@ -71,6 +71,8 @@ u_long Gzip::compressBound (int size)
#else
return -1;
#endif
+
+ return 0;
}
/*!
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 438ef5d..c647554 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -417,7 +417,6 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
u_long headerSize = 0;
bool headerCompleted = false;
u_long headerOffset = 0;
- u_long nbw = 0;
u_long nBytesRead;
/* Parse initial chunks of data looking for the HTTP header. */
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 7f96ce1..0bf2218 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -45,7 +45,6 @@ extern "C"
int HttpFile::putFile (HttpThreadContext* td, string& filename)
{
u_long firstByte = td->request.rangeByteBegin;
- int ret;
try
{
@@ -150,10 +149,8 @@ int HttpFile::putFile (HttpThreadContext* td, string&
filename)
int HttpFile::deleteFile (HttpThreadContext* td,
string& filename)
{
- int permissions = -1;
string directory;
string file;
- int ret;
try
{
if (!(td->permissions & MYSERVER_PERMISSION_DELETE))
@@ -171,7 +168,6 @@ int HttpFile::deleteFile (HttpThreadContext* td,
{
return td->http->raiseHTTPError (500);
};
-
}
/*!
@@ -187,7 +183,7 @@ void HttpFile::generateEtag (string & etag, u_long mtime,
u_long fsize)
/* Do a bit rotation to have less significative bits in the middle. */
u_long x = ROL (mtime, 16) | fsize;
char buf[16];
- sprintf (buf, "%u", x);
+ sprintf (buf, "%lu", x);
etag.assign (buf);
}
@@ -505,10 +501,10 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
if (bytesToSend)
{
/* Read from the file the bytes to send. */
- if (ret = file->read (td->buffer->getBuffer (),
+ if ((ret = file->read (td->buffer->getBuffer (),
std::min (static_cast<u_long> (bytesToSend),
static_cast<u_long> (td->buffer->getRealLength () / 2)),
- &nbr))
+ &nbr)))
break;
if (nbr == 0)
@@ -519,9 +515,9 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
bytesToSend -= nbr;
- if (ret = appendDataToHTTPChannel (td, td->buffer->getBuffer (),
+ if ((ret = appendDataToHTTPChannel (td, td->buffer->getBuffer (),
nbr, &(td->outputData), &chain, td->appendOutputs,
- useChunks, td->buffer->getRealLength (), &memStream))
+ useChunks, td->buffer->getRealLength (), &memStream)))
break;
dataSent += nbr;
@@ -545,17 +541,17 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
Stream* tmpStream = chain.getStream ();
chain.setStream (&memStream);
memStream.refresh ();
- if (ret = chain.flush (&nbw))
+ if ((ret = chain.flush (&nbw)))
break;
chain.setStream (tmpStream);
- if (ret = memStream.read (td->buffer->getBuffer (),
- td->buffer->getRealLength (), &nbr))
+ if ((ret = memStream.read (td->buffer->getBuffer (),
+ td->buffer->getRealLength (), &nbr)))
break;
- if (ret = HttpDataHandler::appendDataToHTTPChannel (td,
+ if ((ret = HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (), nbr, &(td->outputData),
- &chain, td->appendOutputs, useChunks))
+ &chain, td->appendOutputs, useChunks)))
break;
ret = HttpDataHandler::appendDataToHTTPChannel (td, 0, 0,
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 950e7eb..0ef7f6a 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -147,10 +147,11 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
do
{
- if (client.recv (td->auxiliaryBuffer->getBuffer () + read,
- td->auxiliaryBuffer->getRealLength () - read,
- 0,
- td->http->getTimeout ()) < 0)
+ ret = client.recv (td->auxiliaryBuffer->getBuffer () + read,
+ td->auxiliaryBuffer->getRealLength () - read,
+ 0,
+ td->http->getTimeout ());
+ if (ret < 0)
return td->http->raiseHTTPError (500);
read += ret;
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index dc72bfc..f8cce75 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -237,7 +237,7 @@ int Scgi::sendResponse (ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
{
while (!ctx->sock.bytesToRead ())
{
- if ((clock_t)(getTicks () - initialTicks) > td->http->getTimeout ())
+ if ((getTicks () - initialTicks) > (u_long) td->http->getTimeout ())
break;
Thread::wait (1);
}
diff --git a/myserver/src/plugin/plugins_manager.cpp
b/myserver/src/plugin/plugins_manager.cpp
index b108183..6988c41 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -472,7 +472,7 @@ PluginsManager::load (Server *server)
HashMap<string, pair<int, int>* >::Iterator depIt = pinfo->begin ();
string msversion (MYSERVER_VERSION);
- int i = msversion.find ("-", 0);
+ size_t i = msversion.find ("-", 0);
if (i != string::npos)
msversion = msversion.substr (0, i);
diff --git a/myserver/src/protocol/control/control_protocol.cpp
b/myserver/src/protocol/control/control_protocol.cpp
index ba16143..43144a3 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -763,7 +763,6 @@ int ControlProtocol::putFile (ConnectionPtr a, char *fn,
File *in,
{
const char *filename = 0;
File localfile;
- int isAutoRebootToEnable = Server::getInstance ()->isAutorebootEnabled ();
int ret = 0;
/*! # of bytes read. */
u_long nbr = 0;
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index fb2c68f..13e0852 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -1773,10 +1773,10 @@ Ftp::list (const std::string & sParam /*= ""*/ )
}
char nlinkStr[12];
- sprintf (nlinkStr, "%lu", fd.st_nlink);
+ sprintf (nlinkStr, "%lu", static_cast<u_long> (fd.st_nlink));
char fdSizeStr[12];
- sprintf (fdSizeStr, "%li", fd.size);
+ sprintf (fdSizeStr, "%lu", static_cast<u_long> (fd.size));
auxiliaryBuffer << (const char *) perm << " " << nlinkStr << " "
<< username << " " << username << " " << fdSizeStr
@@ -1859,10 +1859,10 @@ Ftp::list (const std::string & sParam /*= ""*/ )
}
char nlinkStr[12];
- sprintf (nlinkStr, "%lu", fd.st_nlink);
+ sprintf (nlinkStr, "%lu", static_cast<u_long> (fd.st_nlink));
char fdSizeStr[12];
- sprintf (fdSizeStr, "%li", fd.size);
+ sprintf (fdSizeStr, "%lu", static_cast<u_long> (fd.size));
auxiliaryBuffer << (const char *) perm << " " << nlinkStr << " "
<< username << " " << username << " " << fdSizeStr
@@ -2496,7 +2496,7 @@ void Ftp::size (const std::string & sPath)
}
char size[12];
- sprintf (size, "%l", f.getFileSize ());
+ sprintf (size, "%lu", static_cast <u_long> (f.getFileSize ()));
f.close ();
ftpReply (213, size);
diff --git a/myserver/src/protocol/ftp/ftp_lexer.cpp
b/myserver/src/protocol/ftp/ftp_lexer.cpp
index 183b888..32602f6 100644
--- a/myserver/src/protocol/ftp/ftp_lexer.cpp
+++ b/myserver/src/protocol/ftp/ftp_lexer.cpp
@@ -1,3 +1,10 @@
/* We need this hack to ensure myserver.h is include before any other file. */
#include "myserver.h"
#include "ftp_lexer.out.cpp"
+
+/* Shutup a warning. */
+void
+ftp_lexer_dummy ()
+{
+ yyunput (0, NULL, NULL);
+}
diff --git a/myserver/src/protocol/gopher/engine.cpp
b/myserver/src/protocol/gopher/engine.cpp
index d75425d..87780cf 100644
--- a/myserver/src/protocol/gopher/engine.cpp
+++ b/myserver/src/protocol/gopher/engine.cpp
@@ -280,7 +280,6 @@ void GopherEngine::infoFile (const string &fname, const
string &path, GopherMenu
{
MemBuf buff;
u_long real;
- int sts;
fsize = f.getFileSize ();
buff.setLength (fsize);
f.read (buff.getBuffer (), fsize, &real);
diff --git a/myserver/src/protocol/gopher/gopher.cpp
b/myserver/src/protocol/gopher/gopher.cpp
index 3ab3fcb..eac81db 100644
--- a/myserver/src/protocol/gopher/gopher.cpp
+++ b/myserver/src/protocol/gopher/gopher.cpp
@@ -59,11 +59,12 @@ const char *Gopher::getNameImpl ()
int Gopher::loadProtocolStatic ()
{
+ return 0;
}
int Gopher::unLoadProtocolStatic ()
{
- return 1;
+ return 0;
}
/*!
@@ -101,6 +102,7 @@ int Gopher::controlConnection (ConnectionPtr pConnection,
GopherContent &Gu = g.incoming (GopherRequest (command.substr (0, loc - 1),
pConnection), pConnection->host);
reply (pConnection,Gu);
+ return ClientsThread::DELETE_CONNECTION;
}
void Gopher::reply (ConnectionPtr pConnection,
diff --git a/myserver/src/protocol/gopher/gopher_content.cpp
b/myserver/src/protocol/gopher/gopher_content.cpp
index 63e3d28..84fc797 100644
--- a/myserver/src/protocol/gopher/gopher_content.cpp
+++ b/myserver/src/protocol/gopher/gopher_content.cpp
@@ -33,7 +33,6 @@ void GopherMenu::addIntro (string freeText, string host,
string port)
size_t size = freeText.size ();
char myline[size];
vector<GopherItem> tmp;
- istream *res;
istringstream str (freeText);
while (!str.getline (myline, size).eof ())
{
@@ -56,7 +55,7 @@ void GopherMenu::addItem (GopherItem i)
void GopherMenu::toProtocol (Socket *s)
{
- for(int i = 0; i < Items.size (); i++)
+ for (u_long i = 0; i < Items.size (); i++)
Items.at (i).toProtocol (s);
s->send (".\n", 3, 0);
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 8a6b7d9..69fb371 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -459,7 +459,7 @@ int Http::preprocessHttpRequest (string& filename, int
yetmapped, int* permissio
{
string directory;
string file;
- int filenamePathLen;
+ u_long filenamePathLen;
string dirscan;
int ret;
@@ -1628,8 +1628,6 @@ int Http::getPath (HttpThreadContext* td, string&
filenamePath,
*/
int Http::processDefaultFile (string& uri, int permissions, int onlyHeader)
{
- int i;
- int ret;
string key ("http.default_file");
NodeTree<string> *node = td->securityToken.getNodeTree (key,
MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF, NULL);
@@ -1773,6 +1771,7 @@ int Http::sendAuth ()
*/
int Http::loadProtocolStatic ()
{
+ return 0;
}
/*!
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index e87cd65..3290dd0 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -64,12 +64,12 @@ extern "C"
Server* Server::instance = NULL;
-Server::Server () : connectionsScheduler (this),
- listenThreads (&connectionsScheduler, this),
- authMethodFactory (&cryptAlgoManager),
- validatorFactory (),
- securityManager (&validatorFactory, &authMethodFactory),
- connectionsPool (100)
+Server::Server () : connectionsPool (100),
+ connectionsScheduler (this),
+ listenThreads (&connectionsScheduler, this),
+ authMethodFactory (&cryptAlgoManager),
+ validatorFactory (),
+ securityManager (&validatorFactory, &authMethodFactory)
{
toReboot = false;
autoRebootEnabled = true;
@@ -563,7 +563,6 @@ void Server::displayBoot ()
{
try
{
- size_t length;
string softwareSignature = "************ GNU MyServer "
MYSERVER_VERSION " ************";
diff --git a/myserver/tests/test_slab.cpp b/myserver/tests/test_slab.cpp
index 1011fba..42b29fc 100644
--- a/myserver/tests/test_slab.cpp
+++ b/myserver/tests/test_slab.cpp
@@ -78,7 +78,7 @@ public:
Slab<TestSlabRecord> slabs (N);
TestSlabRecord *recs[N];
- for (int j = 0; j < N; j++)
+ for (u_long j = 0; j < N; j++)
{
recs[j] = slabs.get ();
CPPUNIT_ASSERT (recs[j]);
@@ -87,7 +87,7 @@ public:
/* No more free instances. */
CPPUNIT_ASSERT_EQUAL (slabs.get (), (TestSlabRecord*)NULL);
- for (int j = 0; j < N; j++)
+ for (u_long j = 0; j < N; j++)
slabs.put (recs[j]);
@@ -100,13 +100,13 @@ public:
Slab<TestSlabRecord> slabs (N);
TestSlabRecord *recs[N * 2];
- for (int j = 0; j < N * 2; j++)
+ for (u_long j = 0; j < N * 2; j++)
{
recs[j] = slabs.forcedGet ();
CPPUNIT_ASSERT (recs[j]);
}
- for (int j = 0; j < N * 2; j++)
+ for (u_long j = 0; j < N * 2; j++)
slabs.put (recs[j]);
}
commit 506db9b0068fee4c8777fea6d953f13fe9c45858
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 16:18:41 2010 +0100
Remove definition of SSL_LIB
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 50c7422..307a8f2 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -9,7 +9,7 @@ all : all-am math_sum.mscgi
math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
-rm -f math_sum.mscgi
$(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a \
- $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB)
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)\
+ $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB)
$(DL_LIB) $(ZLIB_LIB)\
$(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi -shared $(CXXFLAGS)
$(XML_CFLAGS)
install : math_sum.mscgi
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am
b/myserver/binaries/web/cgi-src/post/Makefile.am
index e9bbe16..9821de1 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -9,7 +9,7 @@ all : all-am post.mscgi
post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
-rm -f post.mscgi
$(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a \
- $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB)
$(SSL_LIB) $(ZLIB_LIB)\
+ $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB)
$(ZLIB_LIB)\
$(XML_LIBS) $(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
install : post.mscgi
diff --git a/myserver/configure.ac b/myserver/configure.ac
index dfe5e19..eb4c55e 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -93,8 +93,6 @@ gl_INIT
AC_CHECK_FUNCS(regcomp setgroups localtime_r posix_fallocate \
openat fstatat getpwnam ffsl readdir_r)
-AC_CHECK_LIB(gcrypt, gcry_control)
-
case "${host}" in
*-*-mingw32*)
LDFLAGS="-lwsock32 -lws2_32 -lgdi32 -lole32 -luuid -luserenv $LDFLAGS"
@@ -199,11 +197,12 @@ else
CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
fi
-AC_CHECK_LIB(gnutls-openssl, main, have_ssl=yes)
+AC_CHECK_LIB(gpg-error, gpg_err_init)
+AC_CHECK_LIB(gcrypt, gcry_control)
+AC_CHECK_LIB(gnutls, main)
+AC_CHECK_LIB(gnutls-openssl, main)
-if test x_$have_ssl == x_yes; then
- SSL_LIB="-lgnutls-openssl -lgnutls -lgcrypt -lgpg-error"
-else
+if test x$ac_cv_lib_gnutls_openssl_main != xyes; then
AC_MSG_ERROR(Cannot find ssl libraries)
fi
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 6e65b3b..10ae987 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -7,7 +7,7 @@ myserver_SOURCES = myserver.cpp
myserver_CXXFLAGS = $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
myserver_LDFLAGS = -rdynamic
myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
- $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
+ $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
$(XML_LIBS) ../lib/libgnu.a $(LDFLAGS)
clean-libmyserver.a:
diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index 441b048..98f7ad3 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -65,8 +65,8 @@ test_suite_SOURCES = main.cpp
\
test_xml_validator.cpp
test_suite_LDADD = ../src/libmyserver.a ../lib/libgnu.a $(CPPUNIT_LDFLAGS) \
- $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) \
- $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS)
+ $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
+ $(XML_LIBS) $(LDFLAGS)
install:
commit 6a5c898f27b342c6cbcccf8bb394396aa92e8535
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 15:47:21 2010 +0100
CFLAGS doesn't force gnulib directory inclusion, CXXFLAGS still does.
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index b68d923..50c7422 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -5,13 +5,12 @@ libmath_sum_a_SOURCES = math_sum.cpp
all : all-am math_sum.mscgi
cp math_sum.mscgi ../../cgi-bin/
-libmath_sum.a :
math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
-rm -f math_sum.mscgi
- $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libmath_sum_a_LIBADD) \
- $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)
$(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi \
- -shared $(CXXFLAGS) $(XML_CFLAGS)
+ $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a \
+ $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB)
$(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)\
+ $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi -shared $(CXXFLAGS)
$(XML_CFLAGS)
install : math_sum.mscgi
$(INSTALL) -D 'math_sum.mscgi'
'$(DESTDIR)$(prefix)/var/web/cgi-bin/math_sum.mscgi'
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am
b/myserver/binaries/web/cgi-src/post/Makefile.am
index 0f10994..e9bbe16 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -5,18 +5,17 @@ libpost_a_SOURCES = post.cpp
all : all-am post.mscgi
cp post.mscgi ../../cgi-bin/
-libpost.a :
-
post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
-rm -f post.mscgi
- $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libpost_a_LIBADD) \
- $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)
$(XML_LIBS) $(LDFLAGS) \
- -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
+ $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a \
+ $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB)
$(SSL_LIB) $(ZLIB_LIB)\
+ $(XML_LIBS) $(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
install : post.mscgi
$(INSTALL) -D 'post.mscgi'
'$(DESTDIR)$(prefix)/var/web/cgi-bin/post.mscgi'
+
clean-local:
rm -f post.mscgi
rm -f *.o
diff --git a/myserver/configure.ac b/myserver/configure.ac
index d352dee..dfe5e19 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -99,6 +99,7 @@ case "${host}" in
*-*-mingw32*)
LDFLAGS="-lwsock32 -lws2_32 -lgdi32 -lole32 -luuid -luserenv $LDFLAGS"
MAKE_MSCGI=yes
+ LTCFLAGS=""
;;
*)
dnl Looking for pthreads
@@ -201,7 +202,7 @@ fi
AC_CHECK_LIB(gnutls-openssl, main, have_ssl=yes)
if test x_$have_ssl == x_yes; then
- SSL_LIB="-lgnutls-openssl"
+ SSL_LIB="-lgnutls-openssl -lgnutls -lgcrypt -lgpg-error"
else
AC_MSG_ERROR(Cannot find ssl libraries)
fi
@@ -324,7 +325,8 @@ else
fi
LDFLAGS="$LDFLAGS $LIBS $pic_flag"
-CFLAGS="-I$(pwd)/lib $pic_flag $CFLAGS"
+CFLAGS="$pic_flag $CFLAGS"
+# FIXME: Define in every Makefile.am
CXXFLAGS="-I$(pwd)/lib $pic_flag $CXXFLAGS"
AC_SUBST(CFLAGS)
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index d1244c8..6e65b3b 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = base conf connection connections_scheduler filter
http_handler \
AM_CPPFLAGS = $(all_includes)
bin_PROGRAMS = myserver
myserver_SOURCES = myserver.cpp
-myserver_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -DHOST_STR=\"$(build)\"
-DPREFIX=\"$(prefix)\"
+myserver_CXXFLAGS = $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
myserver_LDFLAGS = -rdynamic
myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
$(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
commit e7313d7c92e16be37e7386eef8c46da0e485dd9f
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Feb 10 13:12:04 2010 +0100
Use LT_INIT to initialize libtool and autoupdate
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 60135dd..d352dee 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -16,10 +16,10 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([GNU MyServer], m4_esyscmd([cat version]), address@hidden)
-AC_PREREQ([2.61])
+AC_INIT([GNU MyServer],[m4_esyscmd(cat version)],address@hidden)
+AC_PREREQ(2.65)
AC_CONFIG_AUX_DIR([build-aux])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
CFLAGS="${CFLAGS=}"
CXXFLAGS="${CXXFLAGS=}"
LDFLAGS="${LDFLAGS=}"
@@ -37,18 +37,18 @@ AC_PROG_CXX
gl_EARLY
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
+AC_SEARCH_LIBS([strerror],[cposix])
+AC_USE_SYSTEM_EXTENSIONS
AC_HEADER_STDC
AM_PROG_LEX
AC_PROG_YACC
AC_C_BIGENDIAN
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
+LT_INIT
AC_DEFINE([WINVER], [0x0501], [WINVER])
-AC_LIBTOOL_WIN32_DLL
+
+LT_INIT
AC_CANONICAL_HOST
@@ -237,7 +237,7 @@ AC_SUBST(SSL_LIB)
if test x$enable_ipv6 = xyes; then
dnl Check for IPv6
AC_MSG_CHECKING([for IPv6])
- AC_TRY_RUN([ /* AF_INET6 available check */
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 available check */
#include <sys/types.h>
#include <sys/socket.h>
main()
@@ -247,23 +247,20 @@ if test x$enable_ipv6 = xyes; then
else
exit(0);
}
- ],
- [ AC_MSG_RESULT(yes)
+ ]])],[ AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_IPV6, 1, [Enable IPv6 support])
- ],
- [ AC_MSG_RESULT(no)
+ ],[ AC_MSG_RESULT(no)
AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
AC_MSG_ERROR([
*** Cannot enable IPv6 support
])
- ],
- [ AC_MSG_RESULT(no)
+ ],[ AC_MSG_RESULT(no)
AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
AC_MSG_ERROR([
*** Cannot enable IPv6 support
])
- ]
- )
+
+ ])
else
AC_DEFINE(HAVE_IPV6, 0, [Disable IPv6 support])
fi
@@ -326,11 +323,9 @@ else
MAKE_GUI=no
fi
-CFLAGS="$CFLAGS $pic_flag"
-CXXFLAGS="$CXXFLAGS $pic_flag"
LDFLAGS="$LDFLAGS $LIBS $pic_flag"
-CFLAGS="-I$(pwd)/lib -I$(pwd)/lib $CFLAGS"
-CXXFLAGS="-I$(pwd)/lib -I$(pwd)/lib $CXXFLAGS"
+CFLAGS="-I$(pwd)/lib $pic_flag $CFLAGS"
+CXXFLAGS="-I$(pwd)/lib $pic_flag $CXXFLAGS"
AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
-----------------------------------------------------------------------
Summary of changes:
myserver/binaries/web/cgi-src/math_sum/Makefile.am | 7 +--
myserver/binaries/web/cgi-src/post/Makefile.am | 9 ++--
myserver/configure.ac | 52 +++++++++-----------
myserver/include/base/slab/slab.h | 2 +-
myserver/include/base/socket/socket.h | 3 -
myserver/include/protocol/ftp/ftp.h | 2 -
myserver/myserver.h | 8 ---
myserver/src/Makefile.am | 4 +-
myserver/src/base/bitvec/bitvec.cpp | 16 +++---
myserver/src/base/file/file.cpp | 6 +--
myserver/src/base/file/files_utility.cpp | 5 +--
myserver/src/base/process/fork_server.cpp | 8 ++--
myserver/src/base/process/process.cpp | 6 +-
.../src/base/process/process_server_manager.cpp | 3 +-
myserver/src/conf/security/xml_validator.cpp | 4 +-
myserver/src/connection/connection.cpp | 4 --
.../src/connections_scheduler/listen_threads.cpp | 4 +-
myserver/src/filter/gzip/gzip.cpp | 2 +
myserver/src/http_handler/cgi/cgi.cpp | 1 -
myserver/src/http_handler/http_file/http_file.cpp | 24 ++++-----
myserver/src/http_handler/proxy/proxy.cpp | 9 ++--
myserver/src/http_handler/scgi/scgi.cpp | 2 +-
myserver/src/plugin/plugins_manager.cpp | 2 +-
myserver/src/protocol/control/control_protocol.cpp | 1 -
myserver/src/protocol/ftp/ftp.cpp | 44 ++++++++--------
myserver/src/protocol/ftp/ftp_lexer.cpp | 7 +++
myserver/src/protocol/gopher/engine.cpp | 1 -
myserver/src/protocol/gopher/gopher.cpp | 4 +-
myserver/src/protocol/gopher/gopher_content.cpp | 3 +-
myserver/src/protocol/http/http.cpp | 11 ++--
myserver/src/server/server.cpp | 13 ++---
myserver/tests/Makefile.am | 4 +-
myserver/tests/test_slab.cpp | 8 ++--
33 files changed, 125 insertions(+), 154 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-55-g38827a0,
Giuseppe Scrivano <=