Author: mturk
Date: Wed Sep 24 01:17:16 2008
New Revision: 698458
URL: http://svn.apache.org/viewvc?rev=698458&view=rev
Log:
Tab police
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
tomcat/connectors/trunk/jk/native/common/portable.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=698458&r1=698457&r2=698458&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Sep 24 01:17:16
2008
@@ -1651,10 +1651,10 @@
if (!p->states) {
free(p);
jk_log(l, JK_LOG_ERROR,
- "Failed allocating private worker state memory");
- JK_TRACE_EXIT(l);
- return JK_FALSE;
- }
+ "Failed allocating private worker state memory");
+ JK_TRACE_EXIT(l);
+ return JK_FALSE;
+ }
*pend = &p->endpoint;
JK_TRACE_EXIT(l);
return JK_TRUE;
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=698458&r1=698457&r2=698458&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Wed Sep 24
01:17:16 2008
@@ -44,6 +44,7 @@
#define JK_UWMAP_EXTENSION_DISABLED "disabled="
#define JK_UWMAP_EXTENSION_STOPPED "stopped="
#define JK_UWMAP_EXTENSION_FAIL_ON_STATUS "fail_on_status="
+#define JK_UWMAP_EXTENSION_USE_SRV_ERRORS "use_server_errors="
#define IND_THIS(x) ((x)[uw_map->index])
#define IND_NEXT(x) ((x)[(uw_map->index+1) % 2])
@@ -583,6 +584,7 @@
uwr->extensions.fail_on_status_size = 0;
uwr->extensions.fail_on_status = NULL;
uwr->extensions.fail_on_status_str = NULL;
+ uwr->extensions.use_server_error_pages = 0;
#ifdef _MT_CODE_PTHREAD
param = strtok_r(w, ";", &lasts);
@@ -598,6 +600,9 @@
if (!strncmp(param, JK_UWMAP_EXTENSION_REPLY_TIMEOUT,
strlen(JK_UWMAP_EXTENSION_REPLY_TIMEOUT))) {
uwr->extensions.reply_timeout = atoi(param +
strlen(JK_UWMAP_EXTENSION_REPLY_TIMEOUT));
}
+ else if (!strncmp(param, JK_UWMAP_EXTENSION_USE_SRV_ERRORS,
strlen(JK_UWMAP_EXTENSION_USE_SRV_ERRORS))) {
+ uwr->extensions.use_server_error_pages = atoi(param +
strlen(JK_UWMAP_EXTENSION_USE_SRV_ERRORS));
+ }
else if (!strncmp(param, JK_UWMAP_EXTENSION_ACTIVE,
strlen(JK_UWMAP_EXTENSION_ACTIVE))) {
if (uwr->extensions.active)
jk_log(l, JK_LOG_WARNING,
Modified: tomcat/connectors/trunk/jk/native/common/portable.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h?rev=698458&r1=698457&r2=698458&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/portable.h (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h Wed Sep 24 01:17:16 2008
@@ -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 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 a `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of a `longlong', as computed by sizeof. */
+#define SIZEOF_LONGLONG 0
+
+/* The size of a `long double', as computed by sizeof. */
+#define SIZEOF_LONG_DOUBLE 12
+
+/* The size of a `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of pid_t */
+#define SIZEOF_PID_T 4
+
+/* The size of a `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.27"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
