Attachment #37214 for bug #64405

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

Lines 23-28 Link Here

(-)modules/proxy/proxy_util.c.orig (+2 lines)
23	#include "proxy_util.h"	23	#include "proxy_util.h"
24	#include "ajp.h"	24	#include "ajp.h"
25	#include "scgi.h"	25	#include "scgi.h"
		26	#include "uwsgi.h"
26		27
27	#include "mod_http2.h" /* for http2_get_num_workers() */	28	#include "mod_http2.h" /* for http2_get_num_workers() */
28		29
Lines 3927-3932 Link Here
3927	{"fcgi", 8000},	3928	{"fcgi", 8000},
3928	{"ajp", AJP13_DEF_PORT},	3929	{"ajp", AJP13_DEF_PORT},
3929	{"scgi", SCGI_DEF_PORT},	3930	{"scgi", SCGI_DEF_PORT},
		3931	{UWSGI_SCHEME, UWSGI_DEFAULT_PORT},
3930	{"h2c", DEFAULT_HTTP_PORT},	3932	{"h2c", DEFAULT_HTTP_PORT},
3931	{"h2", DEFAULT_HTTPS_PORT},	3933	{"h2", DEFAULT_HTTPS_PORT},
3932	{"ws", DEFAULT_HTTP_PORT},	3934	{"ws", DEFAULT_HTTP_PORT},

Lines 49-58 Link Here

(-)modules/proxy/mod_proxy_uwsgi.c.orig (-4 / +1 lines)
49	#include "util_script.h"	49	#include "util_script.h"
50		50
51	#include "mod_proxy.h"	51	#include "mod_proxy.h"
52		52	#include "uwsgi.h"
53
54	#define UWSGI_SCHEME "uwsgi"
55	#define UWSGI_DEFAULT_PORT 3031
56		53
57	module AP_MODULE_DECLARE_DATA proxy_uwsgi_module;	54	module AP_MODULE_DECLARE_DATA proxy_uwsgi_module;
58		55




/* 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.
 */

/**
 * @file uwsgi.h
 * @brief Shared UWSGI-related definitions
 *
 * @ingroup APACHE_INTERNAL
 * @{
 */

#ifndef UWSGI_H
#define UWSGI_H

/* This is not defined by the protocol.  It is a convention
 * of mod_proxy_uwsgi, and mod_proxy utility routines must
 * use the same value as mod_proxy_uwsgi.
 */
#define UWSGI_SCHEME "uwsgi"
#define UWSGI_DEFAULT_PORT 3031

/** @} */

#endif /* UWSGI_H */

Return to bug 64405

Line 0 Link Here

(-)modules/proxy/uwsgi.h.orig (+37 lines)
	1	/* Licensed to the Apache Software Foundation (ASF) under one or more
	2	* contributor license agreements. See the NOTICE file distributed with
	3	* this work for additional information regarding copyright ownership.
	4	* The ASF licenses this file to You under the Apache License, Version 2.0
	5	* (the "License"); you may not use this file except in compliance with
	6	* the License. You may obtain a copy of the License at
	7	*
	8	* http://www.apache.org/licenses/LICENSE-2.0
	9	*
	10	* Unless required by applicable law or agreed to in writing, software
	11	* distributed under the License is distributed on an "AS IS" BASIS,
	12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	13	* See the License for the specific language governing permissions and
	14	* limitations under the License.
	15	*/
	16
	17	/**
	18	* @file uwsgi.h
	19	* @brief Shared UWSGI-related definitions
	20	*
	21	* @ingroup APACHE_INTERNAL
	22	* @{
	23	*/
	24
	25	#ifndef UWSGI_H
	26	#define UWSGI_H
	27
	28	/* This is not defined by the protocol. It is a convention
	29	* of mod_proxy_uwsgi, and mod_proxy utility routines must
	30	* use the same value as mod_proxy_uwsgi.
	31	*/
	32	#define UWSGI_SCHEME "uwsgi"
	33	#define UWSGI_DEFAULT_PORT 3031
	34
	35	/** @} */
	36
	37	#endif /* UWSGI_H */