[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-458
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-458-g3e8bb38 |
|
Date: |
Wed, 20 Apr 2011 20:46:38 +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 3e8bb384d3a08b9c356d70359679faef771ea022 (commit)
via b38ba649b7d8862e841396fc9d359a261606081c (commit)
via 4a675d37a3eff66d9625c58118fb2fd913c5b6ff (commit)
via fd528f4a51e37a1e6112ceddea797289b2aed284 (commit)
via c00a108c12ba3b7caa270b0bdb7f873493b53654 (commit)
via 4f1cf0e830aa539df90b171a270da94ec0911daf (commit)
via 21e5a557c864a207310430739103f33522c2206e (commit)
via 8ffe0bec866e743e11ec36f162fd2dbcfb39f13d (commit)
from 7b7e4bb2e858b296d909f6caec59b641b4aeb1bb (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 3e8bb384d3a08b9c356d70359679faef771ea022
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:45:53 2011 +0200
WebDAV: report correctly the number of sent bytes.
diff --git a/myserver/src/protocol/http/webdav/webdav.cpp
b/myserver/src/protocol/http/webdav/webdav.cpp
index 1217060..41bf189 100644
--- a/myserver/src/protocol/http/webdav/webdav.cpp
+++ b/myserver/src/protocol/http/webdav/webdav.cpp
@@ -335,13 +335,11 @@ int WebDAV::propfind (HttpThreadContext* td)
if (nbr == 0)
break;
- HttpDataHandler::appendDataToHTTPChannel (td, td->buffer->getBuffer
(),
- nbr, &(td->outputData),
- &chain, td->appendOutputs,
- useChunks);
-
- td->sentData += nbr;
-
+ td->sentData +=
+ HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
+ nbr, &(td->outputData),
+ &chain,
td->appendOutputs,
+ useChunks);
if (nbr != td->buffer->getRealLength ())
break;
}
@@ -656,14 +654,11 @@ int WebDAV::lock (HttpThreadContext* td)
if (nbr == 0)
break;
- HttpDataHandler::appendDataToHTTPChannel (td, td->buffer->getBuffer
(),
- nbr, &(td->outputData),
- &chain, td->appendOutputs,
- useChunks);
- td->sentData += nbr;
-
- if (nbr != td->buffer->getRealLength ())
- break;
+ td->sentData +=
+ HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
+ nbr, &(td->outputData),
+ &chain,
td->appendOutputs,
+ useChunks);
}
if (useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
commit b38ba649b7d8862e841396fc9d359a261606081c
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:43:51 2011 +0200
SCGI: report correctly the number of sent bytes.
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index 3bab92a..ac31d70 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -216,7 +216,6 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
u_long headerSize = 0;
u_long tmpHeaderSize = 0;
size_t nbw, nbr;
- u_long sentData = 0;
HttpThreadContext* td = ctx->td;
checkDataChunks (td, &keepalive, &useChunks);
@@ -267,14 +266,10 @@ int Scgi::sendResponse (ScgiContext* ctx, bool
onlyHeader, FiltersChain* chain)
return HttpDataHandler::RET_OK;
if (read - headerSize)
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer () +
headerSize,
- read - headerSize,
- &(td->outputData),
- chain,
- td->appendOutputs,
- useChunks);
-
- sentData += read - headerSize;
+ td->sentData +=
+ appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer () +
headerSize,
+ read - headerSize, &(td->outputData), chain,
+ td->appendOutputs, useChunks);
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
{
@@ -284,24 +279,18 @@ int Scgi::sendResponse (ScgiContext* ctx, bool
onlyHeader, FiltersChain* chain)
td->auxiliaryBuffer->getRealLength (),
0);
- if (!nbr || (nbr == (size_t)-1))
+ if (!nbr || (nbr == (size_t) -1))
break;
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- nbr,
- &(td->outputData),
- chain,
- td->appendOutputs,
- useChunks);
-
- sentData += nbr;
+ td->sentData +=
+ appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
+ nbr, &(td->outputData), chain,
+ td->appendOutputs, useChunks);
}
if (!td->appendOutputs && useChunks)
chain->getStream ()->write ("0\r\n\r\n", 5, &nbw);
}
- /* For logging activity. */
- td->sentData += sentData;
return HttpDataHandler::RET_OK;
}
commit 4a675d37a3eff66d9625c58118fb2fd913c5b6ff
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:41:27 2011 +0200
Proxy: report correctly the number of sent bytes.
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index c8fc684..4c908da 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -277,7 +277,6 @@ int Proxy::readPayLoad (HttpThreadContext* td,
size_t nbr = 0, nbw = 0, length = 0, inPos = 0;
u_long bufferDataSize = 0;
- u_long written = 0;
/* Only the chunked transfer encoding is supported. */
if (serverTransferEncoding && serverTransferEncoding->compare ("chunked"))
@@ -314,12 +313,11 @@ int Proxy::readPayLoad (HttpThreadContext* td,
if (!nbr)
break;
- HttpDataHandler::appendDataToHTTPChannel (td,
+ td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer
(),
nbr, &(td->outputData),
out, td->appendOutputs,
useChunks);
- written += nbr;
}
}
}
@@ -348,11 +346,9 @@ int Proxy::readPayLoad (HttpThreadContext* td,
if (length)
length -= nbr;
- HttpDataHandler::appendDataToHTTPChannel (td, td->buffer->getBuffer
(),
+ td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
nbr, &(td->outputData),
out,
td->appendOutputs,
useChunks);
- written += nbr;
-
if (timedOut || contentLength && length == 0)
break;
}
commit fd528f4a51e37a1e6112ceddea797289b2aed284
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:38:28 2011 +0200
MsCgi: report correctly the number of sent bytes.
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp
b/myserver/src/http_handler/mscgi/mscgi.cpp
index f63bec8..dcca885 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -141,10 +141,6 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
if (!data.error)
return HttpDataHandler::RET_FAILURE;
- ostringstream tmp;
- tmp << td->sentData;
- td->response.contentLength.assign (tmp.str ());
-
chain.clearAllFilters ();
}
@@ -171,15 +167,14 @@ int MsCgi::write (const char* data, u_long len,
MsCgiData* mcd)
if (mcd->onlyHeader)
return 0;
- HttpDataHandler::appendDataToHTTPChannel (mcd->td,
- (char*) data,
- len,
- &(mcd->td->outputData),
- mcd->filtersChain,
- mcd->td->appendOutputs,
- mcd->useChunks);
-
- mcd->td->sentData +=len;
+ mcd->td->sentData +=
+ HttpDataHandler::appendDataToHTTPChannel (mcd->td,
+
mcd->td->auxiliaryBuffer->getBuffer (),
+
mcd->td->auxiliaryBuffer->getLength (),
+ &(mcd->td->outputData),
+ mcd->filtersChain,
+ mcd->td->appendOutputs,
+ mcd->useChunks);
return 0;
}
commit c00a108c12ba3b7caa270b0bdb7f873493b53654
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:29:10 2011 +0200
HttpFile: report sent bytes correctly.
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index b7d665a..5f5249c 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -442,7 +442,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
memStream.refresh ();
if (nbr)
- HttpDataHandler::appendDataToHTTPChannel (td,
+ dataSent += HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
nbr, &(td->outputData),
&chain, td->appendOutputs,
commit 4f1cf0e830aa539df90b171a270da94ec0911daf
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:27:21 2011 +0200
HttpDir: report sent bytes correctly.
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 6f977a8..c16bc10 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -326,7 +326,6 @@ int HttpDir::send (HttpThreadContext* td,
FiltersChain chain;
int lastSlash = 0;
bool useChunks = false;
- u_long sentData = 0;
char* bufferloop;
const char* cssFile;
bool keepalive = false;
@@ -438,12 +437,10 @@ int HttpDir::send (HttpThreadContext* td,
*td->auxiliaryBuffer << "</head>\r\n";
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
- sentData = td->auxiliaryBuffer->getLength ();
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+ td->auxiliaryBuffer->getLength (),
+ &(td->outputData), &chain,
+ td->appendOutputs, useChunks);
filename = directory;
td->auxiliaryBuffer->setLength (0);
@@ -456,12 +453,10 @@ int HttpDir::send (HttpThreadContext* td,
? lastIndex + 1: 0];
*td->auxiliaryBuffer << "</h1>\r\n<hr />\r\n";
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
- sentData += td->auxiliaryBuffer->getLength ();
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+ td->auxiliaryBuffer->getLength (),
+ &(td->outputData), &chain,
+ td->appendOutputs, useChunks);
fd.findfirst (filename.c_str ());
@@ -474,13 +469,10 @@ int HttpDir::send (HttpThreadContext* td,
generateHeader (*td->auxiliaryBuffer, sortType, sortReverse,
formatString);
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
- sentData += td->auxiliaryBuffer->getLength ();
-
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+ td->auxiliaryBuffer->getLength
(),
+ &(td->outputData), &chain,
+ td->appendOutputs, useChunks);
td->auxiliaryBuffer->setLength (0);
if (FilesUtility::getPathRecursionLevel (td->request.uri) >= 1)
@@ -514,12 +506,10 @@ int HttpDir::send (HttpThreadContext* td,
*td->auxiliaryBuffer << "</tr>\r\n";
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
- sentData += td->auxiliaryBuffer->getLength ();
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+
td->auxiliaryBuffer->getLength (),
+ &(td->outputData), &chain,
+ td->appendOutputs,
useChunks);
}
/* Put all files in a vector. */
@@ -578,12 +568,10 @@ int HttpDir::send (HttpThreadContext* td,
FileStruct& file = *it;
td->auxiliaryBuffer->setLength (0);
generateElement (*td->auxiliaryBuffer, file, linkPrefix,
formatString);
- appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
- sentData += td->auxiliaryBuffer->getLength ();
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+
td->auxiliaryBuffer->getLength (),
+ &(td->outputData), &chain,
+ td->appendOutputs,
useChunks);
}
td->auxiliaryBuffer->setLength (0);
@@ -605,13 +593,10 @@ int HttpDir::send (HttpThreadContext* td,
*td->auxiliaryBuffer << portBuff.str ();
}
*td->auxiliaryBuffer << "</address>\r\n</body>\r\n</html>\r\n";
- ret = appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- td->auxiliaryBuffer->getLength (),
- &(td->outputData), &chain,
- td->appendOutputs, useChunks);
-
-
- sentData += td->auxiliaryBuffer->getLength ();
+ td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
+ td->auxiliaryBuffer->getLength
(),
+ &(td->outputData), &chain,
+ td->appendOutputs, useChunks);
*td->auxiliaryBuffer << end_str;
/* Changes the \ character in the / character. */
@@ -622,9 +607,6 @@ int HttpDir::send (HttpThreadContext* td,
if (!td->appendOutputs && useChunks)
chain.getStream ()->write ("0\r\n\r\n", 5, &nbw);
-
- /* For logging activity. */
- td->sentData += sentData;
}
catch (exception & e)
{
commit 21e5a557c864a207310430739103f33522c2206e
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:18:52 2011 +0200
CGI: report correctly the number of sent bytes.
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 35cd862..58e6f43 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -288,7 +288,6 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
Process &cgiProc, bool onlyHeader, bool nph)
{
size_t nbw = 0;
- size_t nbw2 = 0;
size_t nBytesRead = 0;
u_long procStartTime;
bool useChunks = false;
@@ -314,6 +313,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
{
FiltersFactory *ff = Server::getInstance ()->getFiltersFactory ();
ff->chain (&chain, td->mime->filters, td->connection->socket, &nbw, 1);
+ td->sentData += nbw;
}
/* Send the rest of the data until we can read from the pipe. */
@@ -343,24 +343,19 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
break;
if (nBytesRead)
- HttpDataHandler::appendDataToHTTPChannel (td,
+ td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
nBytesRead,
&(td->outputData),
&chain,
td->appendOutputs,
useChunks);
-
- nbw += nBytesRead;
}
/* Send the last null chunk if needed. */
- if (useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
+ if (useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw))
return HttpDataHandler::RET_FAILURE;
- /* Update the Content-length field for logging activity. */
- td->sentData += nbw;
-
return HttpDataHandler::RET_OK;
}
@@ -482,15 +477,13 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe
&stdOutFile, FiltersChain &chai
if (headerOffset - headerSize)
{
/* Flush the buffer. Data from the header parsing can be present. */
- HttpDataHandler::appendDataToHTTPChannel (td,
+ td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer () + headerSize,
headerOffset - headerSize,
&(td->outputData),
&chain,
td->appendOutputs,
- useChunks);
-
- td->sentData += headerOffset - headerSize;
+ useChunks);
}
return 0;
diff --git a/myserver/src/http_handler/fastcgi/fastcgi.cpp
b/myserver/src/http_handler/fastcgi/fastcgi.cpp
index 0d932cb..9b012b7 100644
--- a/myserver/src/http_handler/fastcgi/fastcgi.cpp
+++ b/myserver/src/http_handler/fastcgi/fastcgi.cpp
@@ -620,7 +620,7 @@ int FastCgi::sendData (FcgiContext* con, u_long dim, u_long
timeout,
if (onlyHeader)
return 1;
- HttpDataHandler::appendDataToHTTPChannel (con->td,
+ size_t nbw = HttpDataHandler::appendDataToHTTPChannel (con->td,
con->td->buffer->getBuffer (),
con->td->buffer->getLength (),
&(con->td->outputData),
@@ -628,8 +628,7 @@ int FastCgi::sendData (FcgiContext* con, u_long dim, u_long
timeout,
con->td->appendOutputs,
con->useChunks);
- con->td->sentData += con->td->buffer->getLength ();
-
+ con->td->sentData += nbw;
return 0;
}
@@ -712,14 +711,14 @@ int FastCgi::handleHeader (FcgiContext* con,
FiltersChain* chain, bool* response
/* Flush the buffer if remaining data is present. */
if (size - headerSize)
{
- HttpDataHandler::appendDataToHTTPChannel (con->td,
+ size_t nbw = HttpDataHandler::appendDataToHTTPChannel (con->td,
con->td->buffer->getBuffer ()
+ headerSize,
size - headerSize,
&(con->td->outputData),
chain,
con->td->appendOutputs,
con->useChunks);
- con->td->sentData += size - headerSize;
+ con->td->sentData += nbw;
}
return 0;
commit 8ffe0bec866e743e11ec36f162fd2dbcfb39f13d
Author: Giuseppe Scrivano <address@hidden>
Date: Wed Apr 20 22:17:26 2011 +0200
Remove install-sh
diff --git a/myserver/install-sh b/myserver/install-sh
deleted file mode 100755
index 6781b98..0000000
--- a/myserver/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" "" $nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
- --help display this help and exit.
- --version display version info and exit.
-
- -c (ignored)
- -C install only if different (preserve the last data modification
time)
- -d create directories instead of installing files.
- -g GROUP $chgrpprog installed files to GROUP.
- -m MODE $chmodprog installed files to MODE.
- -o USER $chownprog installed files to USER.
- -s $stripprog installed files.
- -t DIRECTORY install into DIRECTORY.
- -T report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
- RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
- case $1 in
- -c) ;;
-
- -C) copy_on_change=true;;
-
- -d) dir_arg=true;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift;;
-
- --help) echo "$usage"; exit $?;;
-
- -m) mode=$2
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
-
- -o) chowncmd="$chownprog $2"
- shift;;
-
- -s) stripcmd=$stripprog;;
-
- -t) dst_arg=$2
- shift;;
-
- -T) no_target_directory=true;;
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
- --) shift
- break;;
-
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
-
- *) break;;
- esac
- shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from
address@hidden
- for arg
- do
- if test -n "$dst_arg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dst_arg"
- shift # fnord
- fi
- shift # arg
- dst_arg=$arg
- done
-fi
-
-if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
- fi
- # It's OK to call `install-sh -d' without argument.
- # This can happen when creating conditional directories.
- exit 0
-fi
-
-if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
-
- # Set umask so as not to create temps with too-generous modes.
- # However, 'strip' requires both read and write access to temps.
- case $mode in
- # Optimize common cases.
- *644) cp_umask=133;;
- *755) cp_umask=22;;
-
- *[0-7])
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-fi
-
-for src
-do
- # Protect names starting with `-'.
- case $src in
- -*) src=./$src;;
- esac
-
- if test -n "$dir_arg"; then
- dst=$src
- dstdir=$dst
- test -d "$dstdir"
- dstdir_status=$?
- else
-
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
- if test ! -f "$src" && test ! -d "$src"; then
- echo "$0: $src does not exist." >&2
- exit 1
- fi
-
- if test -z "$dst_arg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
-
- dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
-
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
- fi
- dstdir=$dst
- dst=$dstdir/`basename "$src"`
- dstdir_status=0
- else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
- test -d "$dstdir"
- dstdir_status=$?
- fi
- fi
-
- obsolete_mkdir_used=false
-
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
- esac
-
- if
- $posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
-
- # The umask is ridiculous, or mkdir does not conform to POSIX,
- # or it failed possibly due to a race condition. Create the
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
- /*) prefix='/';;
- -*) prefix='./';;
- *) prefix='';;
- esac
-
- eval "$initialize_posix_glob"
-
- oIFS=$IFS
- IFS=/
- $posix_glob set -f
- set fnord $dstdir
- shift
- $posix_glob set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
- test -z "$d" && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
- fi
- fi
- fi
-
- if test -n "$dir_arg"; then
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
- else
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
- # Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
- # If any of these fail, we abort the whole thing. If we want to
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
- #
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
- rm -f "$dsttmp"
- else
- # Rename the file to the real destination.
- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
-
- trap '' 0
- fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
-----------------------------------------------------------------------
Summary of changes:
myserver/install-sh | 520 ---------------------
myserver/src/http_handler/cgi/cgi.cpp | 17 +-
myserver/src/http_handler/fastcgi/fastcgi.cpp | 9 +-
myserver/src/http_handler/http_dir/http_dir.cpp | 66 +--
myserver/src/http_handler/http_file/http_file.cpp | 2 +-
myserver/src/http_handler/mscgi/mscgi.cpp | 21 +-
myserver/src/http_handler/proxy/proxy.cpp | 8 +-
myserver/src/http_handler/scgi/scgi.cpp | 29 +-
myserver/src/protocol/http/webdav/webdav.cpp | 25 +-
9 files changed, 63 insertions(+), 634 deletions(-)
delete mode 100755 myserver/install-sh
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-458-g3e8bb38,
Giuseppe Scrivano <=