You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2007/12/21 14:59:26 UTC
svn commit: r606201 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12:
./ jk/native/common/jk_util.c jk/native/common/portable.h jni/
jni/CHANGELOG.txt jni/native/ jni/native/src/sslnetwork.c
Author: jfclere
Date: Fri Dec 21 05:59:25 2007
New Revision: 606201
URL: http://svn.apache.org/viewvc?rev=606201&view=rev
Log:
tag tcnative 1.1.12
Added:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/
- copied from r605171, tomcat/connectors/trunk/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/
- copied from r605457, tomcat/connectors/trunk/jni/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/CHANGELOG.txt
- copied unchanged from r605607, tomcat/connectors/trunk/jni/CHANGELOG.txt
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/native/
- copied from r605534, tomcat/connectors/trunk/jni/native/
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jni/native/src/sslnetwork.c
- copied unchanged from r605571, tomcat/connectors/trunk/jni/native/src/sslnetwork.c
Modified:
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Modified: tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c?rev=606201&r1=605171&r2=606201&view=diff
==============================================================================
--- tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c Fri Dec 21 05:59:25 2007
@@ -31,6 +31,13 @@
#include "jk_lb_worker.h"
#include "jk_mt.h"
+#include "ap_config.h"
+#include "httpd.h"
+#include "http_config.h"
+#include "http_core.h"
+#include "http_log.h"
+
+
#define SYSPROPS_OF_WORKER ("sysprops")
#define STDERR_OF_WORKER ("stderr")
#define STDOUT_OF_WORKER ("stdout")
@@ -605,6 +612,8 @@
* to the output routing.
*/
static int usable_size = HUGE_BUFFER_SIZE - 3;
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+ "jk_log %d %d %d", l, file, fmt);
if (!l || !file || !fmt) {
return -1;
}
Modified: tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h?rev=606201&r1=605171&r2=606201&view=diff
==============================================================================
--- tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h (original)
+++ tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h Fri Dec 21 05:59:25 2007
@@ -1,18 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* On most platform this file is overwritten when doing configure */
-/* DON'T COMMIT THE FILE IT BREAKS windoze and Netware, commit the sample file */
+/* common/portable.h. Generated from portable.h.in by configure. */
+/* common/portable.h.in. Generated from configure.in by autoheader. */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Have flock() */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Have snprintf() */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Have vsnprintf() */
+#define HAVE_VSNPRINTF 1
+
+/* Name of package */
+#define PACKAGE "mod_jk"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `longlong', as computed by sizeof. */
+#define SIZEOF_LONGLONG 0
+
+/* The size of `long double', as computed by sizeof. */
+#define SIZEOF_LONG_DOUBLE 12
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of pid_t */
+#define SIZEOF_PID_T 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to use SO_RCVTIMEO with setsockopt() */
+#define USE_SO_RCVTIMEO 1
+
+/* Define to use SO_SNDTIMEO with setsockopt() */
+#define USE_SO_SNDTIMEO 1
+
+/* Version number of package */
+#define VERSION "1.2.26"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r606201 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12:
./ jk/native/common/jk_util.c jk/native/common/portable.h jni/ jni/CHANGELOG.txt
jni/native/ jni/native/src/sslnetwork.c
Posted by jean-frederic clere <jf...@gmail.com>.
Rainer Jung wrote:
> Hi Jean-Frederic,
>
> I think you accidentally committed two changes to mod_jk when tagging
> tc-native.
Oops I have rolled them back but that doesn't affect tcnative release code.
Cheers
Jean-Frederic
>
> Since I'm going to tag mod_jk, please let me know, if I can revert (or
> revert yourself):
>
>> Modified:
>>
>> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
>>
>>
>> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
>>
>
> Regards,
>
> Rainer
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r606201 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12:
./ jk/native/common/jk_util.c jk/native/common/portable.h jni/ jni/CHANGELOG.txt
jni/native/ jni/native/src/sslnetwork.c
Posted by Rainer Jung <ra...@kippdata.de>.
Rainer Jung wrote:
> Hi Jean-Frederic,
>
> I think you accidentally committed two changes to mod_jk when tagging
> tc-native.
>
> Since I'm going to tag mod_jk, please let me know, if I can revert (or
> revert yourself):
>
>> Modified:
>>
>> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
>> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Ah, sorry, it's not trunk but inside you tag. So I don't need to care,
but it might be better to revert inside the tag (als long as the tag is
not public).
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r606201 - in /tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12:
./ jk/native/common/jk_util.c jk/native/common/portable.h jni/ jni/CHANGELOG.txt
jni/native/ jni/native/src/sslnetwork.c
Posted by Rainer Jung <ra...@kippdata.de>.
Hi Jean-Frederic,
I think you accidentally committed two changes to mod_jk when tagging
tc-native.
Since I'm going to tag mod_jk, please let me know, if I can revert (or
revert yourself):
> Modified:
> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c
> tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org