View | Details | Raw Unified | Return to bug 35298
Collapse All | Expand All

(-)jk/native - multiple filters/iis/jk_isapi_plugin.c (-4 / +25 lines)
Lines 51-60 Link Here
51
 * 3. The contents of the Translate header, if any
51
 * 3. The contents of the Translate header, if any
52
 *
52
 *
53
 */
53
 */
54
#define URI_HEADER_NAME              ("TOMCATURI:")
54
#define URI_HEADER_NAME_BASE              ("TOMCATURI")
55
#define QUERY_HEADER_NAME            ("TOMCATQUERY:")
55
#define QUERY_HEADER_NAME_BASE            ("TOMCATQUERY")
56
#define WORKER_HEADER_NAME           ("TOMCATWORKER:")
56
#define WORKER_HEADER_NAME_BASE           ("TOMCATWORKER")
57
#define TOMCAT_TRANSLATE_HEADER_NAME ("TOMCATTRANSLATE:")
57
#define TOMCAT_TRANSLATE_HEADER_NAME_BASE ("TOMCATTRANSLATE")
58
59
static char URI_HEADER_NAME[_MAX_FNAME];
60
static char QUERY_HEADER_NAME[_MAX_FNAME];
61
static char WORKER_HEADER_NAME[_MAX_FNAME];
62
static char TOMCAT_TRANSLATE_HEADER_NAME[_MAX_FNAME];
63
64
/* The template used to construct our unique headers 
65
   from the base name and module instance */
66
#define HEADER_TEMPLATE ("%s_%d:")
67
58
#define CONTENT_LENGTH               ("CONTENT_LENGTH:")
68
#define CONTENT_LENGTH               ("CONTENT_LENGTH:")
59
69
60
#define HTTP_URI_HEADER_NAME         ("HTTP_TOMCATURI")
70
#define HTTP_URI_HEADER_NAME         ("HTTP_TOMCATURI")
Lines 1090-1095 Link Here
1090
        else {
1100
        else {
1091
            fReturn = JK_FALSE;
1101
            fReturn = JK_FALSE;
1092
        }
1102
        }
1103
        /* Construct redirector headers to use for this redirector instance */
1104
        sprintf(URI_HEADER_NAME, HEADER_TEMPLATE, URI_HEADER_NAME_BASE, hInst);
1105
        sprintf(QUERY_HEADER_NAME, HEADER_TEMPLATE, QUERY_HEADER_NAME_BASE, hInst);
1106
        sprintf(WORKER_HEADER_NAME, HEADER_TEMPLATE, WORKER_HEADER_NAME_BASE, hInst);
1107
        sprintf(TOMCAT_TRANSLATE_HEADER_NAME, HEADER_TEMPLATE, TOMCAT_TRANSLATE_HEADER_NAME_BASE, hInst);
1108
1093
    break;
1109
    break;
1094
    case DLL_PROCESS_DETACH:
1110
    case DLL_PROCESS_DETACH:
1095
        __try {
1111
        __try {
Lines 1139-1144 Link Here
1139
        jk_log(logger, JK_LOG_DEBUG, "Using worker mount file %s.",
1155
        jk_log(logger, JK_LOG_DEBUG, "Using worker mount file %s.",
1140
               worker_mount_file);
1156
               worker_mount_file);
1141
        jk_log(logger, JK_LOG_DEBUG, "Using uri select %d.", uri_select_option);
1157
        jk_log(logger, JK_LOG_DEBUG, "Using uri select %d.", uri_select_option);
1158
1159
        jk_log(logger, JK_LOG_DEBUG, "Using uri header %s.", URI_HEADER_NAME);
1160
        jk_log(logger, JK_LOG_DEBUG, "Using query header %s.", QUERY_HEADER_NAME);
1161
        jk_log(logger, JK_LOG_DEBUG, "Using worker header %s.", WORKER_HEADER_NAME);
1162
        jk_log(logger, JK_LOG_DEBUG, "Using translate header %s.", TOMCAT_TRANSLATE_HEADER_NAME);
1142
    }
1163
    }
1143
    if (uri_worker_map_alloc(&uw_map, NULL, logger)) {
1164
    if (uri_worker_map_alloc(&uw_map, NULL, logger)) {
1144
        rc = JK_FALSE;
1165
        rc = JK_FALSE;

Return to bug 35298