DO NOT REPLY [Bug 45797] Oi
https://issues.apache.org/bugzilla/show_bug.cgi?id=45797 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-09-13 03:52:28 PST --- This Bugzilla instance is not a sandbox for you to play with. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r694934 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Sep 13 04:40:49 2008 New Revision: 694934 URL: http://svn.apache.org/viewvc?rev=694934&view=rev Log: Propose fix for typo Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=694934&r1=694933&r2=694934&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 13 04:40:49 2008 @@ -136,4 +136,8 @@ http://svn.apache.org/viewvc?rev=693378&view=rev +1: pero -1: - \ No newline at end of file + +* Fix cut and paste error in JSP EL examples + http://svn.apache.org/viewvc?rev=694791&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r694951 - in /tomcat/trunk/java/org/apache/tomcat/util/net: JIoEndpoint.java res/LocalStrings.properties
Author: markt
Date: Sat Sep 13 07:24:47 2008
New Revision: 694951
URL: http://svn.apache.org/viewvc?rev=694951&view=rev
Log:
Log a warning if we create the maximum number of threads
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=694951&r1=694950&r2=694951&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sat Sep 13
07:24:47 2008
@@ -661,6 +661,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.warn(sm.getString("endpoint.warn.maxThreads",
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=694951&r1=694950&r2=694951&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
Sat Sep 13 07:24:47 2008
@@ -26,6 +26,7 @@
endpoint.debug.unlock=Caught exception trying to unlock accept on port {0}
endpoint.err.close=Caught exception trying to close socket
endpoint.noProcessor=No Processors - worker thread dead!
+endpoint.warn.maxThreads=Maximum number of threads ({0}) created for connector
with address {1} and port {2}
endpoint.init.bind=Socket bind failed: [{0}] {1}
endpoint.init.listen=Socket listen failed: [{0}] {1}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r694952 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Sep 13 07:26:10 2008 New Revision: 694952 URL: http://svn.apache.org/viewvc?rev=694952&view=rev Log: Propose new warning if we create maxThreads Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=694952&r1=694951&r2=694952&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 13 07:26:10 2008 @@ -141,3 +141,8 @@ http://svn.apache.org/viewvc?rev=694791&view=rev +1: markt -1: + +* Fix log a warning if we create maxThreads + http://svn.apache.org/viewvc?rev=694951&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Servlet 3.0 and Common Javaflow
Hi all, I read that Servlet 3.0 will probably support pause/resume methods and I read that Jetty 7 preview already rewrote its continuations support to expose "standard" servlet 3.0 services. Is there any plan to support this in tomcat? Do you know that ASF host a cool generic continuation library? Commons Javaflow (http://commons.apache.org/sandbox/javaflow/) I'm just spreading the word, because I thought javaflow is interesting for supporting servlet 3.0 and I would be happy to see some community built around this cool library. Stefano - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r694992 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/session/ java/org/apache/tomcat/util/http/ webapps/docs/config/
Author: markt
Date: Sat Sep 13 10:39:47 2008
New Revision: 694992
URL: http://svn.apache.org/viewvc?rev=694992&view=rev
Log:
Add HttpOnly support to session cookies. It is enabled by default and can be
disabled at via manager configuration.
Based on a patch by Jim Manico.
Modified:
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
tomcat/trunk/webapps/docs/config/manager.xml
Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=694992&r1=694991&r2=694992&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Sat Sep 13 10:39:47 2008
@@ -240,6 +240,24 @@
public void setSessionAverageAliveTime(int sessionAverageAliveTime);
+/**
+ * Gets the value of the use HttpOnly cookies for session cookies flag.
+ *
+ * @return true if the HttpOnly flag should be set on session
+ * cookies
+ */
+public boolean getUseHttpOnly();
+
+
+/**
+ * Sets the use HttpOnly cookies for session cookies flag.
+ *
+ * @param useHttpOnly Set to true to use HttpOnly cookies
+ * for session cookies
+ */
+public void setUseHttpOnly(boolean useHttpOnly);
+
+
// - Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=694992&r1=694991&r2=694992&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Sep 13
10:39:47 2008
@@ -2331,7 +2331,7 @@
Cookie cookie = new Cookie(Globals.SESSION_COOKIE_NAME,
session.getIdInternal());
configureSessionCookie(cookie);
-response.addCookieInternal(cookie);
+response.addCookieInternal(cookie, manager.getUseHttpOnly());
}
if (session != null) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=694992&r1=694991&r2=694992&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sat Sep 13
10:39:47 2008
@@ -954,6 +954,17 @@
* @param cookie Cookie to be added
*/
public void addCookieInternal(final Cookie cookie) {
+addCookieInternal(cookie, false);
+}
+
+/**
+ * Add the specified Cookie to those that will be included with
+ * this Response.
+ *
+ * @param cookieCookie to be added
+ * @param httpOnly Should the httpOnly falg be set on this cookie
+ */
+public void addCookieInternal(final Cookie cookie, final boolean httpOnly)
{
if (isCommitted())
return;
@@ -968,7 +979,8 @@
(sb, cookie.getVersion(), cookie.getName(),
cookie.getValue(), cookie.getPath(),
cookie.getDomain(), cookie.getComment(),
- cookie.getMaxAge(), cookie.getSecure());
+ cookie.getMaxAge(), cookie.getSecure(),
+ httpOnly);
return null;
}
});
@@ -976,7 +988,7 @@
ServerCookie.appendCookieValue
(sb, cookie.getVersion(), cookie.getName(), cookie.getValue(),
cookie.getPath(), cookie.getDomain(),
cookie.getComment(),
- cookie.getMaxAge(), cookie.getSecure());
+ cookie.getMaxAge(), cookie.getSecure(), httpOnly);
}
//if we reached here, no exception, cookie is valid
// the header name is Set-Cookie for both "old" and v.1 ( RFC2109 )
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=694992&r1=694991&r2=694992&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.j
DO NOT REPLY [Bug 44382] Need to add support for HTTPOnly session cookie parameter
https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 --- Comment #12 from Mark Thomas <[EMAIL PROTECTED]> 2008-09-13 10:44:28 PST --- I have applied a variation of your patches to trunk and will propose them for 6.0.x and 5.5.x shortly. The main differences are: 1. No change to the Servlet API classes. Whilst this is in the 3.0 draft, the API isn't defined and whilst I am reasonably sure what it will look like I don't want to risk API breakage when the 3.0 API is published. 2. It is enabled by default in trunk and will be enabled by default in Tomcat 7.x. I will propose the same default for 6.0.x and 5.5.x but we'll need to see which way the votes go. 3. It is configured via the Manager. Where there is an option to use the standard Tomcat configuration mechanism I prefer to use it. System properties should be reserved for configuration that doesn't fit with a standard component or would require some ugly hacks to do so. This was a nice, simple fit with the Manager. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r694994 - in /tomcat: current/tc5.5.x/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Sep 13 10:49:02 2008 New Revision: 694994 URL: http://svn.apache.org/viewvc?rev=694994&view=rev Log: Propose HttpOnly enhancement for 6.0.x and 5.5.x Modified: tomcat/current/tc5.5.x/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=694994&r1=694993&r2=694994&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Sep 13 10:49:02 2008 @@ -84,3 +84,10 @@ http://svn.apache.org/viewvc?rev=693378&view=rev +1: pero -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 + Use HttpOnly for session cookies. This is enabled by default. Feel free to + caveat you vote with a preference for disabled by default. + http://svn.apache.org/viewvc?rev=694992&view=rev + +1: mark (prefer enabled, happy with disabled) + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=694994&r1=694993&r2=694994&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Sep 13 10:49:02 2008 @@ -146,3 +146,10 @@ http://svn.apache.org/viewvc?rev=694951&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382 + Use HttpOnly for session cookies. This is enabled by default. Feel free to + caveat you vote with a preference for disabled by default. + http://svn.apache.org/viewvc?rev=694992&view=rev + +1: mark (prefer enabled, happy with disabled) + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r695000 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh
Author: rjung Date: Sat Sep 13 11:33:19 2008 New Revision: 695000 URL: http://svn.apache.org/viewvc?rev=695000&view=rev Log: Fix message typo. Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?rev=695000&r1=694999&r2=695000&view=diff == --- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original) +++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Sat Sep 13 11:33:19 2008 @@ -109,7 +109,7 @@ answer="x" while [ "$answer" != "y" -a "$answer" != "n" ] do -echo "Do you want to procede? [y/n]" +echo "Do you want to proceed? [y/n]" read answer done if [ "$answer" != "y" ] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r695001 - in /tomcat/connectors/trunk/jk/native: apache-1.3/Makefile.apxs.in apache-2.0/Makefile.apxs.in apache-2.0/Makefile.in configure.in
Author: rjung
Date: Sat Sep 13 11:40:22 2008
New Revision: 695001
URL: http://svn.apache.org/viewvc?rev=695001&view=rev
Log:
Tab, trailing spces and typo in comments police.
Of course we keep the leading tabs in the Makefile templates.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
tomcat/connectors/trunk/jk/native/configure.in
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in?rev=695001&r1=695000&r2=695001&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in Sat Sep 13
11:40:22 2008
@@ -32,8 +32,8 @@
all: mod_jk.so
-mod_jk.so:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL}
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+mod_jk.so:
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL}
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in?rev=695001&r1=695000&r2=695001&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in Sat Sep 13
11:40:22 2008
@@ -32,12 +32,12 @@
all: mod_jk.la
-mod_jk.la:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+mod_jk.la:
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
install: mod_jk.la
$(APXS) -i mod_jk.la
-
+
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
rm -rf .libs
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in?rev=695001&r1=695000&r2=695001&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in Sat Sep 13
11:40:22 2008
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-##
+##
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -36,9 +36,9 @@
# Will define libexecdir, LIBTOOL, etc
include @APACHE_CONFIG_VARS@
-# Local settings ( overriding/appending to Apache's )
+# Local settings ( overriding/appending to Apache's )
COMMON=../common
-JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
+JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L
${JAVA_HOME}/lib/${ARCH}/native_threads
[EMAIL PROTECTED]@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} ${APXSCPPFLAGS}
${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
@@ -49,7 +49,7 @@
OEXT=.lo
-all: Makefile @LIB_JK_TYPE@
+all: Makefile @LIB_JK_TYPE@
install: @INSTALL_TYPE@
Makefile: Makefile.in
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=695001&r1=695000&r2=695001&view=diff
==
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sat Sep 13 11:40:22 2008
@@ -103,20 +103,20 @@
APA=`${GREP} STANDARD20 ${APXS}`
if ${TEST} -z "$APA" ; then
WEBSERVER="apache-1.3"
- APXSCC="`$APXS -q CC`"
- APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
- APXS_CPPFLAGS=""
+APXSCC="`$APXS -q CC`"
+APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
+APXS_CPPFLAGS=""
else
WEBSERVER="apache-2.0"
- APRINCLUDEDIR=""
- INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
- for INC in ${INCTEMP}; do
- APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
- done
+APRINCLUDEDIR=""
+INCTEMP="`$APXS -q APR_INCLUDEDIR` `$APXS -q APU_INCLUDEDIR`"
+for INC in ${INCTEMP}; do
+APRINCLUDEDIR="${APRINCLUDEDIR} -I${INC}"
+done
AC_MSG_RESULT([APRINCLUDEDIR is $APRINCLUDEDIR])
- APXSCC="`$APXS -q CC`"
- APXSCFLAG
svn commit: r695003 - in /tomcat/connectors/trunk/jk: native/apache-1.3/Makefile.apxs.in native/apache-1.3/Makefile.in native/apache-2.0/Makefile.apxs.in native/apache-2.0/Makefile.in native/configure
Author: rjung
Date: Sat Sep 13 11:51:06 2008
New Revision: 695003
URL: http://svn.apache.org/viewvc?rev=695003&view=rev
Log:
Use correct ld flags provided by apxs when building module.
Prevents some crashes on AIX for httpd 1.3 module.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
tomcat/connectors/trunk/jk/native/configure.in
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in?rev=695003&r1=695002&r2=695003&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in Sat Sep 13
11:51:06 2008
@@ -33,7 +33,7 @@
all: mod_jk.so
mod_jk.so:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL}
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL}
${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in?rev=695003&r1=695002&r2=695003&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in Sat Sep 13
11:51:06 2008
@@ -49,7 +49,7 @@
JK_CFLAGS = $(JK_INCL) $(JAVA_INCL) $(APACHE_CFLAGS)
COMPILE= $(CC)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
-MOD_LINK = $(LIBTOOL) --mode=link $(CC)
+MOD_LINK = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
include ../common/list.mk
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in?rev=695003&r1=695002&r2=695003&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in Sat Sep 13
11:51:06 2008
@@ -33,7 +33,7 @@
all: mod_jk.la
mod_jk.la:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
"${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
install: mod_jk.la
$(APXS) -i mod_jk.la
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in?rev=695003&r1=695002&r2=695003&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in Sat Sep 13
11:51:06 2008
@@ -23,6 +23,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
# Defaults
@@ -78,7 +79,7 @@
# APXS will compile every file, this is derived from apxs
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
- $(LIBTOOL) --mode=link ${COMPILE} `${APXS} -q LDFLAGS` -o $@ -module
-rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath
${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
mod_jk.so: mod_jk.la
../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=695003&r1=695002&r2=695003&view=diff
==
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sat Sep 13 11:51:06 2008
@@ -105,7 +105,11 @@
WEBSERVER="apache-1.3"
APXSCC="`$APXS -q CC`"
APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
-APXS_CPPFLAGS=""
+APXSCPPFLAGS=""
+dnl sed magic needed to prepend each token with "-Wl," s.t.
libtool
+dnl detects those arguments correctly as ld flags.
+dnl Double square brackets needed, because single ones will be
removed by autoconf.
+APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB | $SED -e 's/\([[^
]]*\)/-Wl,\1/g'`"
else
svn commit: r695053 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Sat Sep 13 15:47:21 2008 New Revision: 695053 URL: http://svn.apache.org/viewvc?rev=695053&view=rev Log: Add missing executor element in NIO docs Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=695053&r1=695052&r2=695053&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Sat Sep 13 15:47:21 2008 @@ -410,6 +410,11 @@ This value is ignored if the executor attribute is present and points to a valid shared thread pool. + +A reference to the name in an Executor element. + If this attribute is enabled, and the named executor exists, the connector will + use the executor, and all the other thread attributes will be ignored. + (int)The number of threads to be used to accept connections. Increase this value on a multi CPU machine, although you would never really need more than 2. Also, with a lot of non keep alive connections, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r695054 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/config/http.xml
Author: markt Date: Sat Sep 13 15:49:56 2008 New Revision: 695054 URL: http://svn.apache.org/viewvc?rev=695054&view=rev Log: Add missing executor element in NIO docs Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 13 15:49:56 2008 @@ -1 +1 @@ -/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781 +/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,695053 Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=695054&r1=695053&r2=695054&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Sat Sep 13 15:49:56 2008 @@ -410,6 +410,11 @@ This value is ignored if the executor attribute is present and points to a valid shared thread pool. + +A reference to the name in an Executor element. + If this attribute is enabled, and the named executor exists, the connector will + use the executor, and all the other thread attributes will be ignored. + (int)The number of threads to be used to accept connections. Increase this value on a multi CPU machine, although you would never really need more than 2. Also, with a lot of non keep alive connections, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
