January 2009 - jbossnative-commits

JBoss Native SVN: r2188 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-21 03:55:46 -0500 (Wed, 21 Jan 2009) New Revision: 2188 Added: trunk/mod_cluster/test/java/apachectl.bat Log: Script to stop/start httpd on windoze. Added: trunk/mod_cluster/test/java/apachectl.bat =================================================================== --- trunk/mod_cluster/test/java/apachectl.bat (rev 0) +++ trunk/mod_cluster/test/java/apachectl.bat 2009-01-21 08:55:46 UTC (rev 2188) @@ -0,0 +1,35 @@ +@echo off +REM Copyright(c) 2009 Red Hat Middleware, LLC, +REM and individual contributors as indicated by the @authors tag. +REM See the copyright.txt in the distribution for a +REM full listing of individual contributors. +REM +REM This library is free software; you can redistribute it and/or +REM modify it under the terms of the GNU Lesser General Public +REM License as published by the Free Software Foundation; either +REM version 2 of the License, or (at your option) any later version. +REM +REM This library is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +REM Lesser General Public License for more details. +REM +REM You should have received a copy of the GNU Lesser General Public +REM License along with this library in the file COPYING.LIB; +REM if not, write to the Free Software Foundation, Inc., +REM 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +REM +REM @author Jean-Frederic Clere +REM +@echo on + +@if "%1" == "stop" goto stop + +"@BASELOC(a)\httpd-2.2\bin\httpd.exe" -k install +"@BASELOC(a)\httpd-2.2\bin\httpd.exe" -k start +goto end + +:stop +"@BASELOC(a)\httpd-2.2\bin\httpd.exe" -k stop +"@BASELOC(a)\httpd-2.2\bin\httpd.exe" -k uninstall +:end Property changes on: trunk/mod_cluster/test/java/apachectl.bat ___________________________________________________________________ Name: svn:executable + *

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2187 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 10:30:26 -0500 (Tue, 20 Jan 2009) New Revision: 2187 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Oops windoze use 8080!!! Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 15:17:57 UTC (rev 2186) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 15:30:26 UTC (rev 2187) @@ -179,7 +179,7 @@ # Arrange httpd.conf file=$BASELOC/${BASEHTTPDCONF}/httpd.conf cp -p $file $file.new -echo "s/Listen 80/Listen @IP@:8000/" > sed.cmd +echo "s/Listen 80.*/Listen @IP@:8000/" > sed.cmd echo "s/LoadModule proxy_balancer/#LoadModule proxy_balancer/" >> sed.cmd sed -f sed.cmd $file > $file.new cat >> $file.new <<EOF

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2186 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 10:17:57 -0500 (Tue, 20 Jan 2009) New Revision: 2186 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Finish arranging location for windoze. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 14:43:04 UTC (rev 2185) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 15:17:57 UTC (rev 2186) @@ -75,6 +75,8 @@ BUILD_TAG=${BUILD_SYS}-${BUILD_CPU} EXT=tar.gz BASEHTTPD=opt/jboss/httpd +BASEHTTPDCONF=opt/jboss/httpd/httpd/conf +BASEHTTPDSBIN=opt/jboss/httpd/sbin case $BUILD_TAG in *hpux-parisc2*) BASE=mod_cluster-hp-ux-9000_800 @@ -101,6 +103,8 @@ BASE=mod_cluster-windows EXT=zip BASEHTTPD=httpd-2.2 + BASEHTTPDCONF=httpd-2.2/conf + BASEHTTPDSBIN=httpd-2.2/bin ;; esac #PACKAGE=rhel-httpd-2.2.8-1.el5s2 @@ -141,39 +145,39 @@ (cd $BASELOC gzip -dc ${TARBALL} | tar xvf - ) + # Arrange the installed files + files="${BASEHTTPDSBIN}/apachectl ${BASEHTTPDCONF}/httpd.conf ${BASEHTTPDSBIN}/envvars" + for FILE in `echo $files` + do + file=${BASELOC}/$FILE + echo "$file" + cp -p $file $file.new + sed "s:${BASEHTTPD}:${BASELOC}/${BASEHTTPD}:" $file > $file.new + mv $file $file.`date +%y%m%d.%H%M%S`.org + mv $file.new $file + done + # Arrange apachectl + file=$BASELOC/${BASEHTTPDSBIN}/apachectl + cp -p $file $file.new + echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/${BASEHTTPD}/httpd:" > sed.cmd + sed -f sed.cmd $file > $file.new + mv $file $file.`date +%y%m%d.%H%M%S`.1.org + mv $file.new $file ;; *) (cd $BASELOC unzip ${TARBALL} ) + # Arrange the installed files (cd $BASELOC/httpd-2.2/bin ./installconf.bat ) ;; esac + # -# Arrange the installed files -# -files="${BASEHTTPD}/sbin/apachectl ${BASEHTTPD}/httpd/conf/httpd.conf ${BASEHTTPD}/sbin/envvars" -for FILE in `echo $files` -do - file=${BASELOC}/$FILE - echo "$file" - cp -p $file $file.new - sed "s:${BASEHTTPD}:${BASELOC}/${BASEHTTPD}:" $file > $file.new - mv $file $file.`date +%y%m%d.%H%M%S`.org - mv $file.new $file -done -# Arrange apachectl -file=$BASELOC/${BASEHTTPD}/sbin/apachectl -cp -p $file $file.new -echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/${BASEHTTPD}/httpd:" > sed.cmd -sed -f sed.cmd $file > $file.new -mv $file $file.`date +%y%m%d.%H%M%S`.1.org -mv $file.new $file - # Arrange httpd.conf -file=$BASELOC/${BASEHTTPD}/httpd/conf/httpd.conf +file=$BASELOC/${BASEHTTPDCONF}/httpd.conf cp -p $file $file.new echo "s/Listen 80/Listen @IP@:8000/" > sed.cmd echo "s/LoadModule proxy_balancer/#LoadModule proxy_balancer/" >> sed.cmd @@ -207,5 +211,5 @@ mv $file.new.1 $file # restore the execute permissions. -chmod a+x $BASELOC/${BASEHTTPD}/sbin/* +chmod a+x $BASELOC/${BASEHTTPDSBIN}/* chmod a+x $BASELOC/${BASEHTTPD}/bin/*

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2185 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 09:43:04 -0500 (Tue, 20 Jan 2009) New Revision: 2185 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: typo + start the installconf.bat script. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 14:13:21 UTC (rev 2184) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 14:43:04 UTC (rev 2185) @@ -126,9 +126,10 @@ # prevent spaces... counts=`echo $BASELOC | wc -w` -if [ $count != "1" ] +if [ $counts != "1" ] then BASELOC=BASELOC + mkdir -p ${BASELOC} fi export BASELOC echo "Base is: $BASELOC !!!" @@ -145,6 +146,9 @@ (cd $BASELOC unzip ${TARBALL} ) + (cd $BASELOC/httpd-2.2/bin + ./installconf.bat + ) ;; esac #

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2184 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 09:13:21 -0500 (Tue, 20 Jan 2009) New Revision: 2184 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Prevent using a name with space in windoze. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 13:48:51 UTC (rev 2183) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 14:13:21 UTC (rev 2184) @@ -74,6 +74,7 @@ echo "on ${BUILD_SYS} ${BUILD_CPU}" BUILD_TAG=${BUILD_SYS}-${BUILD_CPU} EXT=tar.gz +BASEHTTPD=opt/jboss/httpd case $BUILD_TAG in *hpux-parisc2*) BASE=mod_cluster-hp-ux-9000_800 @@ -99,6 +100,7 @@ *windows*) BASE=mod_cluster-windows EXT=zip + BASEHTTPD=httpd-2.2 ;; esac #PACKAGE=rhel-httpd-2.2.8-1.el5s2 @@ -121,10 +123,18 @@ wget ${TARBALL} fi TARBALL=`pwd`/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} + +# prevent spaces... +counts=`echo $BASELOC | wc -w` +if [ $count != "1" ] +then + BASELOC=BASELOC +fi export BASELOC echo "Base is: $BASELOC !!!" + # Clean previous install -rm -rf $BASELOC/opt/jboss +rm -rf $BASELOC/$BASEHTTPD case ${EXT} in tar.gz) (cd $BASELOC @@ -140,26 +150,26 @@ # # Arrange the installed files # -files="opt/jboss/httpd/sbin/apachectl opt/jboss/httpd/httpd/conf/httpd.conf opt/jboss/httpd/sbin/envvars" +files="${BASEHTTPD}/sbin/apachectl ${BASEHTTPD}/httpd/conf/httpd.conf ${BASEHTTPD}/sbin/envvars" for FILE in `echo $files` do file=${BASELOC}/$FILE echo "$file" cp -p $file $file.new - sed "s:opt/jboss/httpd:${BASELOC}/opt/jboss/httpd:" $file > $file.new + sed "s:${BASEHTTPD}:${BASELOC}/${BASEHTTPD}:" $file > $file.new mv $file $file.`date +%y%m%d.%H%M%S`.org mv $file.new $file done # Arrange apachectl -file=$BASELOC/opt/jboss/httpd/sbin/apachectl +file=$BASELOC/${BASEHTTPD}/sbin/apachectl cp -p $file $file.new -echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/opt/jboss/httpd/httpd:" > sed.cmd +echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/${BASEHTTPD}/httpd:" > sed.cmd sed -f sed.cmd $file > $file.new mv $file $file.`date +%y%m%d.%H%M%S`.1.org mv $file.new $file # Arrange httpd.conf -file=$BASELOC/opt/jboss/httpd/httpd/conf/httpd.conf +file=$BASELOC/${BASEHTTPD}/httpd/conf/httpd.conf cp -p $file $file.new echo "s/Listen 80/Listen @IP@:8000/" > sed.cmd echo "s/LoadModule proxy_balancer/#LoadModule proxy_balancer/" >> sed.cmd @@ -193,5 +203,5 @@ mv $file.new.1 $file # restore the execute permissions. -chmod a+x $BASELOC/opt/jboss/httpd/sbin/* -chmod a+x $BASELOC/opt/jboss/httpd/bin/* +chmod a+x $BASELOC/${BASEHTTPD}/sbin/* +chmod a+x $BASELOC/${BASEHTTPD}/bin/*

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2183 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 08:48:51 -0500 (Tue, 20 Jan 2009) New Revision: 2183 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: windoze file are .zip Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 13:19:00 UTC (rev 2182) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 13:48:51 UTC (rev 2183) @@ -98,6 +98,7 @@ ;; *windows*) BASE=mod_cluster-windows + EXT=zip ;; esac #PACKAGE=rhel-httpd-2.2.8-1.el5s2

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2182 - trunk/mod_cluster/native/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 08:19:00 -0500 (Tue, 20 Jan 2009) New Revision: 2182 Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c Log: Copy the ap_proxy_hex2c into our code. Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c =================================================================== --- trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-20 12:33:06 UTC (rev 2181) +++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2009-01-20 13:19:00 UTC (rev 2182) @@ -1210,6 +1210,62 @@ * Decodes a '%' escaped string, and returns the number of characters * (From mod_proxy_ftp.c). */ + +/* already called in the knowledge that the characters are hex digits */ +/* Copied from modules/proxy/proxy_util.c */ +static int mod_manager_hex2c(const char *x) +{ + int i, ch; + +#if !APR_CHARSET_EBCDIC + ch = x[0]; + if (apr_isdigit(ch)) { + i = ch - '0'; + } + else if (apr_isupper(ch)) { + i = ch - ('A' - 10); + } + else { + i = ch - ('a' - 10); + } + i <<= 4; + + ch = x[1]; + if (apr_isdigit(ch)) { + i += ch - '0'; + } + else if (apr_isupper(ch)) { + i += ch - ('A' - 10); + } + else { + i += ch - ('a' - 10); + } + return i; +#else /*APR_CHARSET_EBCDIC*/ + /* + * we assume that the hex value refers to an ASCII character + * so convert to EBCDIC so that it makes sense locally; + * + * example: + * + * client specifies %20 in URL to refer to a space char; + * at this point we're called with EBCDIC "20"; after turning + * EBCDIC "20" into binary 0x20, we then need to assume that 0x20 + * represents an ASCII char and convert 0x20 to EBCDIC, yielding + * 0x40 + */ + char buf[1]; + + if (1 == sscanf(x, "%2x", &i)) { + buf[0] = i & 0xFF; + ap_xlate_proto_from_ascii(buf, 1); + return buf[0]; + } + else { + return 0; + } +#endif /*APR_CHARSET_EBCDIC*/ +} static int decodeenc(char *x) { int i, j, ch; @@ -1220,7 +1276,7 @@ /* decode it if not already done */ ch = x[i]; if (ch == '%' && apr_isxdigit(x[i + 1]) && apr_isxdigit(x[i + 2])) { - ch = ap_proxy_hex2c(&x[i + 1]); + ch = mod_manager_hex2c(&x[i + 1]); i += 2; } x[j] = ch;

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2181 - trunk/httpd/httpd-2.2/modules/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 07:33:06 -0500 (Tue, 20 Jan 2009) New Revision: 2181 Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 Log: Oops the sessionid object is missing here too. Modified: trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2009-01-20 11:10:09 UTC (rev 2180) +++ trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2009-01-20 12:33:06 UTC (rev 2181) @@ -2,7 +2,7 @@ APACHE_MODPATH_INIT(mod_manager) -manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo" +manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo" APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , no)

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2180 - trunk/httpd/httpd-2.2/modules/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 06:10:09 -0500 (Tue, 20 Jan 2009) New Revision: 2180 Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager Log: Oops sessionid was missing. Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2009-01-20 10:00:59 UTC (rev 2179) +++ trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2009-01-20 11:10:09 UTC (rev 2180) @@ -51,6 +51,7 @@ $(WORKDIR)\context.obj \ $(WORKDIR)\host.obj \ $(WORKDIR)\node.obj \ + $(WORKDIR)\sessionid.obj \ $(WORKDIR)\mod_manager.obj {$(SRCDIR)}.c{$(WORKDIR)}.obj:

15 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2179 - trunk/httpd/httpd-2.2/modules/mod_manager.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 05:00:59 -0500 (Tue, 20 Jan 2009) New Revision: 2179 Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager Log: n fact mod_manager shouldn't need mod_proxy.lib Modified: trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2009-01-20 09:18:57 UTC (rev 2178) +++ trunk/httpd/httpd-2.2/modules/mod_manager/NMAKEmanager 2009-01-20 10:00:59 UTC (rev 2179) @@ -33,7 +33,7 @@ !include <..\..\NMAKEhttpd.inc> LDIRS = /libpath:"$(BUILDLIB)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) $(WORKDIR)\mod_proxy.lib +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) CFLAGS = $(CFLAGS) -DCLUSTER_DECLARE_EXPORT INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../generators -I../proxy -I../ssl

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits January 2009