Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Henri Gomez]

May be at some time in the future we should think about a mod_jk 2.x
requiring and using APR to remove all platform complexity :-)

Even on Apache 1.3 we could have jk bundled with APR statically



2007/4/2, Mladen Turk <[EMAIL PROTECTED]>:

Rainer Jung wrote:
> I used 2003 .net, but this includes a 7.0 version of msvcrt.dll.
>
> I build apache httpd 1.3 by myself and then mod_jk, and now everything
> works as expected. So you are right, the binary httpd download is not
> compatible with module compilation by vc++ 7.0.
>
> Any idea how one can make vc++ 7 use the 6.0 msvcrt dll? The 6.0 dll is
> included in the msi for apache 1.3 from the download.
>

You cannot do that unless you have VS 6.0.
This is BTW the reason why the httpd binaries are compiled with
msvcrt.dll (the binaries can be used with msvcrt71 or msvcrt80,
but not the other way round).

Regards,
Mladen.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524737 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c common/jk_util.c

[mturk]

Author: mturk
Date: Mon Apr  2 00:14:47 2007
New Revision: 524737

URL: http://svn.apache.org/viewvc?view=rev&rev=524737
Log:
Fix LF/CRLF logging for POSIX/WIN32 platforms

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=524737&r1=524736&r2=524737
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Apr  2 00:14:47 
2007
@@ -2370,11 +2370,19 @@
 int log_fd = flp->log_fd;
 size_t sz = strlen(what);
 if (log_fd >= 0 && sz) {
-if ( write(log_fd, what, sz) < 0 )
-{
+if (write(log_fd, what, sz) < 0 ) {
 ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL,
  "mod_jk: jk_log_to_file %s failed",
  what);
+}
+else {
+char c;
+#if defined(WIN32)
+c = '\n';
+write(log_fd, &c, 1);
+#endif
+c = '\n';
+write(log_fd, &c, 1);
 }
 }
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=524737&r1=524736&r2=524737
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Apr  2 00:14:47 
2007
@@ -2516,6 +2516,10 @@
  "mod_jk: jk_log_to_file %s failed: %s",
  what, error);
 }
+#if defined(WIN32)
+apr_file_putc('\r', p->jklogfp);
+#endif
+apr_file_putc('\n', p->jklogfp);
 rv = apr_global_mutex_unlock(jk_log_lock);
 if (rv != APR_SUCCESS) {
 ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=524737&r1=524736&r2=524737
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Apr  2 00:14:47 2007
@@ -400,6 +400,7 @@
 jk_file_logger_t *p = l->logger_private;
 if (p->logfile) {
 fputs(what, p->logfile);
+fputc('\n', p->logfile);
 /* [V] Flush the dam' thing! */
 fflush(p->logfile);
 }
@@ -492,8 +493,8 @@
const char *fmt, ...)
 {
 int rc = 0;
-/* Need to reserve space for newline and terminating zero byte. */
-static int usable_size = HUGE_BUFFER_SIZE-2;
+/* Need to reserve space for terminating zero byte. */
+static int usable_size = HUGE_BUFFER_SIZE - 1;
 if (!l || !file || !fmt) {
 return -1;
 }
@@ -576,7 +577,6 @@
 } else {
 used = usable_size;
 }
-buf[used++] = '\n';
 buf[used] = 0;
 l->log(l, level, buf);
 #ifdef NETWARE



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Mladen Turk]

Henri Gomez wrote:

May be at some time in the future we should think about a mod_jk 2.x
requiring and using APR to remove all platform complexity :-)



Think we tried that with jk2 and failed.


Even on Apache 1.3 we could have jk bundled with APR statically



Don't think so.

Regards,
Mladen.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524738 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[mturk]

Author: mturk
Date: Mon Apr  2 00:17:40 2007
New Revision: 524738

URL: http://svn.apache.org/viewvc?view=rev&rev=524738
Log:
Oops. Standard copy/paste error ;)

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=524738&r1=524737&r2=524738
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Apr  2 00:17:40 
2007
@@ -2378,7 +2378,7 @@
 else {
 char c;
 #if defined(WIN32)
-c = '\n';
+c = '\r';
 write(log_fd, &c, 1);
 #endif
 c = '\n';



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Henri Gomez]

jk2 was more than just APRised mod_jk.


2007/4/2, Mladen Turk <[EMAIL PROTECTED]>:

Henri Gomez wrote:
> May be at some time in the future we should think about a mod_jk 2.x
> requiring and using APR to remove all platform complexity :-)
>

Think we tried that with jk2 and failed.

> Even on Apache 1.3 we could have jk bundled with APR statically
>

Don't think so.

Regards,
Mladen.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r521417 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Mladen Turk]

Rainer Jung wrote:

Hi Mladen,

I checked out jk trunk today and built mod_jk


Can you double check the trunk?
Think I've fixed the CRLF issue.

Regards,
Mladen.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524774 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[mturk]

Author: mturk
Date: Mon Apr  2 05:25:44 2007
New Revision: 524774

URL: http://svn.apache.org/viewvc?view=rev&rev=524774
Log:
Remove explicit settings for ANT_HOME and JAVA_HOME.

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?view=diff&rev=524774&r1=524773&r2=524774
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Mon Apr  2 05:25:44 2007
@@ -29,9 +29,6 @@
 done
 shift `expr $OPTIND - 1`
 
-export ANT_HOME=/usr/local/ant
-export JAVA_HOME=/usr/local/jdk1.4.2
-
 SVNROOT="http://svn.apache.org/repos/asf";
 SVNPROJ="tomcat/connectors"
 JK_CVST="tomcat-connectors"



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Quality check mod_jk-1.2.22

[Mladen Turk]

Hi all,

The next version of mod_jk is approaching its release. A code snapshot is 
available at:
http://people.apache.org/~mturk/jk-1.2.22-dev/

It is in the same format as a release download, so easy to build.
It would be nice, if we could get some testing feedback from the community.
Feel free to post any observations.
Depending on your feedback we plan to tag the release at the end of the week.

The most important changes are:

- Fix startup error if no JkWorkersFile is used
- IIS: Fix Keep-Alive regression introduced in 1.2.21.
- Apache. Add ForwardSSLCertChain JkOption.
- IIS: Added pcre like regular expressions for url rewrite rules.

The full change log is available under:
http://people.apache.org/~mturk/jk-1.2.22-dev/changelog.html

Thanks for your valuable time!

Regards,
Mladen


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524777 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[mturk]

Author: mturk
Date: Mon Apr  2 05:57:24 2007
New Revision: 524777

URL: http://svn.apache.org/viewvc?view=rev&rev=524777
Log:
Do not try to make the release on the hosts where tar doesn't support cfz.

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?view=diff&rev=524777&r1=524776&r2=524777
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Mon Apr  2 05:57:24 2007
@@ -193,8 +193,7 @@
 cd ../../
 
 # Pack and sign
-tar cvf ${JK_DIST}.tar --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST}
-gzip ${JK_DIST}.tar
+tar cfz ${JK_DIST}.tar.gz ${JK_DIST}
 perl ${JK_DIST}/tools/lineends.pl --cr ${JK_DIST}
 zip -9 -r ${JK_DIST}.zip ${JK_DIST}
 # Create detatched signature



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Quality check mod_jk-1.2.22

[William L. Thomson Jr.]

On Mon, 2007-04-02 at 14:55 +0200, Mladen Turk wrote:
> Hi all,
> 
> The next version of mod_jk is approaching its release. A code snapshot is 
> available at:
> http://people.apache.org/~mturk/jk-1.2.22-dev/

Little version funkiness? 

http://people.apache.org/~mturk/jk-1.2.22-dev/tomcat-connectors-1.1.22-dev-524775-src.tar.gz

1.1.22 ? 

Dropping versions huh :) I assume actual release will be 1.2.22. No need
to re-package dev snapshot, just wanted to mention it.

-- 
William L. Thomson Jr.
Gentoo/Java


signature.asc
Description: This is a digitally signed message part

Re: [VOTE] Release Tomcat 4.1.36

[Yoav Shapira]

Hola,

On 4/1/07, Mark Thomas <[EMAIL PROTECTED]> wrote:

Tomcat 4.1.36 is:
[ X ] Stable


Yoav

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Quality check mod_jk-1.2.22

[William L. Thomson Jr.]

On Mon, 2007-04-02 at 17:55 +0200, Mladen Turk wrote:
> William L. Thomson Jr. wrote:
> >>
> >> The next version of mod_jk is approaching its release. A code snapshot is 
> >> available at:
> >> http://people.apache.org/~mturk/jk-1.2.22-dev/
> > 
> > Little version funkiness? 
> > 1.1.22 ? 
> >
> 
> LOL, my bad, but you already know what I meant (1.2.22)

Yep no worries, I have packaged and added to Gentoo's ~arch as
1.2.22_pre since we don't have a package name to reflect -dev.
Should hit mirrors in a few hours.

-- 
William L. Thomson Jr.
Gentoo/Java


signature.asc
Description: This is a digitally signed message part

Re: Quality check mod_jk-1.2.22

[Mladen Turk]

William L. Thomson Jr. wrote:


The next version of mod_jk is approaching its release. A code snapshot is 
available at:
http://people.apache.org/~mturk/jk-1.2.22-dev/


Little version funkiness? 
1.1.22 ? 



LOL, my bad, but you already know what I meant (1.2.22)

Cheers,
Mladen.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524836 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

[remm]

Author: remm
Date: Mon Apr  2 09:51:29 2007
New Revision: 524836

URL: http://svn.apache.org/viewvc?view=rev&rev=524836
Log:
- If an exception is thrown processing an event which was not an error, the 
contract says an ERROR event 
  should be called.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?view=diff&rev=524836&r1=524835&r2=524836
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
Mon Apr  2 09:51:29 2007
@@ -141,6 +141,14 @@
 // Calling the container
 
connector.getContainer().getPipeline().getFirst().event(request, response, 
request.getEvent());
 
+if (!error && !response.isClosed() && 
(request.getAttribute(Globals.EXCEPTION_ATTR) != null)) {
+// An unexpected exception occurred while processing the 
event, so
+// error should be called
+
request.getEvent().setEventType(CometEvent.EventType.ERROR);
+request.getEvent().setEventSubType(null);
+error = true;
+
connector.getContainer().getPipeline().getFirst().event(request, response, 
request.getEvent());
+}
 if (response.isClosed() || !request.isComet()) {
 res.action(ActionCode.ACTION_COMET_END, null);
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: 6.0.11 anyone

[Remy Maucherat]

Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:

Any thoughts on a 6.0.11 release?


I propose tagging on monday. The polish patches should be applied before 
then (like the one which fixes the links in the examples).


Ok, I have a small commit to make to fix a glitch with Comet, but since 
I don't like last minute commits, I'd like to propose pushing back 
tagging to tomorrow.


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: 6.0.11 anyone

[Filip Hanik - Dev Lists]

Remy Maucherat wrote:

Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:

Any thoughts on a 6.0.11 release?


I propose tagging on monday. The polish patches should be applied 
before then (like the one which fixes the links in the examples).


Ok, I have a small commit to make to fix a glitch with Comet, but 
since I don't like last minute commits, I'd like to propose pushing 
back tagging to tomorrow.

works for me
Filip


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]






-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r524777 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[Rainer Jung]

Hi Mladen,

did you delete setting owner and group by accident from the release script?

[EMAIL PROTECTED] schrieb:
>  
>  # Pack and sign
> -tar cvf ${JK_DIST}.tar --owner="${JK_OWNER}" --group="${JK_GROUP}" ${JK_DIST}
> -gzip ${JK_DIST}.tar
> +tar cfz ${JK_DIST}.tar.gz ${JK_DIST}
>  perl ${JK_DIST}/tools/lineends.pl --cr ${JK_DIST}
>  zip -9 -r ${JK_DIST}.zip ${JK_DIST}

Regards,

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r524777 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[Mladen Turk]

Rainer Jung wrote:

Hi Mladen,

did you delete setting owner and group by accident from the release script?



No, I did it by purpose. I don't have user or group named asf, so the tar
fails. What would be a purpose of it anyhow, and how would you ensure
that the same user will exist on the users box?

Regards,
Mladen.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r524777 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[William A. Rowe, Jr.]

Mladen Turk wrote:
> Rainer Jung wrote:
>> Hi Mladen,
>>
>> did you delete setting owner and group by accident from the release
>> script?
>>
> 
> No, I did it by purpose. I don't have user or group named asf, so the tar
> fails. What would be a purpose of it anyhow, and how would you ensure
> that the same user will exist on the users box?

It should be root / bin or similar.

Simple - if you unpack without root privilage, it unpacks as 'you'.

If 'you' == root, it would try to restore mladen:staff or whatever your
group is.  Please back out this change and make an appropriate change :)

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 42025] New: - Incorrect documentation in RemoteAddrValve/RemoteHostValve

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=42025

   Summary: Incorrect documentation in
RemoteAddrValve/RemoteHostValve
   Product: Tomcat 5
   Version: 5.5.23
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Webapps:Documentation
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


The documentation page at http://tomcat.apache.org/tomcat-5.5-
doc/config/valve.html says:

"The syntax for regular expressions is different than that for 'standard' 
wildcard matching. Tomcat uses the Jakarta Regexp library. Please consult the 
Regexp documentation for details of the expressions supported."

This is incorrect. In reality, the standard Java regexp package java.util.regex 
is used. The syntax is slightly different than Jakarta Regexp. In particular, 
the matches() method is used by RemoteAddrValve/RemoteHostValve, which attempts 
to match the entire region against the pattern. 

E.g. I expected
http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r524974 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java

[remm]

Author: remm
Date: Mon Apr  2 16:54:06 2007
New Revision: 524974

URL: http://svn.apache.org/viewvc?view=rev&rev=524974
Log:
- Fix javadocs (no return false anymore).

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java?view=diff&rev=524974&r1=524973&r2=524974
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/CometEvent.java Mon Apr  2 
16:54:06 2007
@@ -48,11 +48,13 @@
  *  without blocking. The available and ready methods of the InputStream or
  *  Reader may be used to determine if there is a risk of blocking: the 
servlet
  *  should read while data is reported available, and can make one 
additional read
- *  without blocking. When encountering a read error or an EOF, the 
servlet MUST
- *  report it by either returning false or throwing an exception such as 
an 
- *  IOException. This will cause the error event to be invoked, and the 
connection
- *  will be closed. It is not allowed to attempt reading data from the 
request object
- *  outside of the execution of this method.
+ *  without blocking. When encountering a read error, the servlet should
+ *  report it by propagating the exception properly. Throwing an exception 
will 
+ *  cause the error event to be invoked, and the connection will be 
closed. 
+ *  Alternately, it is also possible to catch any exception, perform clean 
up
+ *  on any data structure the servlet may be using, and using the close 
method
+ *  of the event. It is not allowed to attempt reading data from the 
request 
+ *  object outside of the execution of this method.
  * END - End may be called to end the processing of the request. Fields 
that have
  *  been initialized in the begin method should be reset. After this event 
has
  *  been processed, the request and response objects, as well as all their 
dependent



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]