From cc19d3ca86c5a66e2afa6b8184e414935225311a Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Sat, 10 Feb 2018 15:46:12 +0000 Subject: [PATCH] On the 2.4.x branch: Merged /httpd/httpd/trunk:r1821371,1822502-1822503,1822624 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823781 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ STATUS | 4 ---- modules/http2/h2.h | 13 ++++++------ modules/http2/h2_alt_svc.c | 15 -------------- modules/http2/h2_alt_svc.h | 13 ++++++------ modules/http2/h2_bucket_beam.c | 34 +++++++++++++------------------- modules/http2/h2_bucket_beam.h | 13 ++++++------ modules/http2/h2_bucket_eos.h | 13 ++++++------ modules/http2/h2_config.c | 15 -------------- modules/http2/h2_config.h | 13 ++++++------ modules/http2/h2_conn.c | 15 -------------- modules/http2/h2_conn.h | 13 ++++++------ modules/http2/h2_conn_io.c | 15 -------------- modules/http2/h2_conn_io.h | 13 ++++++------ modules/http2/h2_ctx.c | 15 -------------- modules/http2/h2_ctx.h | 13 ++++++------ modules/http2/h2_filter.c | 20 +++++-------------- modules/http2/h2_filter.h | 13 ++++++------ modules/http2/h2_from_h1.c | 15 -------------- modules/http2/h2_from_h1.h | 13 ++++++------ modules/http2/h2_h2.c | 15 -------------- modules/http2/h2_h2.h | 13 ++++++------ modules/http2/h2_headers.c | 15 -------------- modules/http2/h2_headers.h | 13 ++++++------ modules/http2/h2_mplx.c | 15 -------------- modules/http2/h2_mplx.h | 13 ++++++------ modules/http2/h2_ngn_shed.c | 15 -------------- modules/http2/h2_ngn_shed.h | 13 ++++++------ modules/http2/h2_private.h | 13 ++++++------ modules/http2/h2_proxy_session.c | 15 -------------- modules/http2/h2_proxy_session.h | 13 ++++++------ modules/http2/h2_proxy_util.c | 15 -------------- modules/http2/h2_proxy_util.h | 13 ++++++------ modules/http2/h2_push.c | 15 -------------- modules/http2/h2_push.h | 14 +++++++------ modules/http2/h2_request.c | 15 -------------- modules/http2/h2_request.h | 13 ++++++------ modules/http2/h2_session.c | 15 -------------- modules/http2/h2_session.h | 13 ++++++------ modules/http2/h2_stream.c | 27 +------------------------ modules/http2/h2_stream.h | 22 +++++++-------------- modules/http2/h2_switch.c | 15 -------------- modules/http2/h2_switch.h | 13 ++++++------ modules/http2/h2_task.c | 15 -------------- modules/http2/h2_task.h | 13 ++++++------ modules/http2/h2_util.c | 15 -------------- modules/http2/h2_util.h | 13 ++++++------ modules/http2/h2_version.h | 33 ++++++++++++++++--------------- modules/http2/h2_workers.c | 15 -------------- modules/http2/h2_workers.h | 14 ++++++------- modules/http2/mod_http2.c | 20 ++++--------------- modules/http2/mod_http2.h | 13 ++++++------ modules/http2/mod_proxy_http2.c | 20 ++++--------------- modules/http2/mod_proxy_http2.h | 13 ++++++------ 54 files changed, 239 insertions(+), 570 deletions(-) diff --git a/CHANGES b/CHANGES index c7c5939049..e9a6b46dea 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.30 + *) mod_http2: obsolete code removed, no more events on beam pool destruction, + discourage content encoders on http2-status response (where they do not work). + [Stefan Eissing] + *) mpm_event: Let the listener thread do its maintenance job on resources shortage. PR 61979. [Yann Ylavic] diff --git a/STATUS b/STATUS index 645ace5b0a..3a2d997d03 100644 --- a/STATUS +++ b/STATUS @@ -119,10 +119,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_http2: obsolete code removed, no more events on beam pool destruction, - discourage content encoders on http2-status response (where they do not work) - 2.4.x patch: svn merge -c 1821371,1822502,1822503 ^/httpd/httpd/trunk . - +1: ylavic, icing, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/http2/h2.h b/modules/http2/h2.h index ad6979c182..48d023e434 100644 --- a/modules/http2/h2.h +++ b/modules/http2/h2.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_alt_svc.c b/modules/http2/h2_alt_svc.c index b6a6e336ba..295a16df25 100644 --- a/modules/http2/h2_alt_svc.c +++ b/modules/http2/h2_alt_svc.c @@ -13,21 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ #include #include diff --git a/modules/http2/h2_alt_svc.h b/modules/http2/h2_alt_svc.h index 51f89d00b8..479e4d119a 100644 --- a/modules/http2/h2_alt_svc.h +++ b/modules/http2/h2_alt_svc.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_bucket_beam.c b/modules/http2/h2_bucket_beam.c index 33c791579e..6b6750d1fa 100644 --- a/modules/http2/h2_bucket_beam.c +++ b/modules/http2/h2_bucket_beam.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include @@ -571,9 +556,8 @@ static void recv_buffer_cleanup(h2_bucket_beam *beam, h2_beam_lock *bl) } } -static apr_status_t beam_cleanup(void *data) +static apr_status_t beam_cleanup(h2_bucket_beam *beam, int from_pool) { - h2_bucket_beam *beam = data; apr_status_t status = APR_SUCCESS; int safe_send = (beam->owner == H2_BEAM_OWNER_SEND); int safe_recv = (beam->owner == H2_BEAM_OWNER_RECV); @@ -586,6 +570,11 @@ static apr_status_t beam_cleanup(void *data) * Clean up receiver first, if safe, then cleanup sender, if safe. */ + /* When called from pool destroy, io callbacks are disabled */ + if (from_pool) { + beam->cons_io_cb = NULL; + } + /* When modify send is not safe, this means we still have multi-thread * protection and the owner is receiving the buckets. If the sending * side has not gone away, this means we could have dangling buckets @@ -621,10 +610,15 @@ static apr_status_t beam_cleanup(void *data) return status; } +static apr_status_t beam_pool_cleanup(void *data) +{ + return beam_cleanup(data, 1); +} + apr_status_t h2_beam_destroy(h2_bucket_beam *beam) { - apr_pool_cleanup_kill(beam->pool, beam, beam_cleanup); - return beam_cleanup(beam); + apr_pool_cleanup_kill(beam->pool, beam, beam_pool_cleanup); + return beam_cleanup(beam, 0); } apr_status_t h2_beam_create(h2_bucket_beam **pbeam, apr_pool_t *pool, @@ -657,7 +651,7 @@ apr_status_t h2_beam_create(h2_bucket_beam **pbeam, apr_pool_t *pool, if (APR_SUCCESS == rv) { rv = apr_thread_cond_create(&beam->change, pool); if (APR_SUCCESS == rv) { - apr_pool_pre_cleanup_register(pool, beam, beam_cleanup); + apr_pool_pre_cleanup_register(pool, beam, beam_pool_cleanup); *pbeam = beam; } } diff --git a/modules/http2/h2_bucket_beam.h b/modules/http2/h2_bucket_beam.h index c48d15382b..f260762366 100644 --- a/modules/http2/h2_bucket_beam.h +++ b/modules/http2/h2_bucket_beam.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_bucket_eos.h b/modules/http2/h2_bucket_eos.h index 27b501dad3..04e32e37f1 100644 --- a/modules/http2/h2_bucket_eos.h +++ b/modules/http2/h2_bucket_eos.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_config.c b/modules/http2/h2_config.c index d874458d15..0f495c7500 100644 --- a/modules/http2/h2_config.c +++ b/modules/http2/h2_config.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_config.h b/modules/http2/h2_config.h index 9b38b8660c..54f74dd40a 100644 --- a/modules/http2/h2_config.h +++ b/modules/http2/h2_config.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c index f37d951727..ed07c7d2bc 100644 --- a/modules/http2/h2_conn.c +++ b/modules/http2/h2_conn.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_conn.h b/modules/http2/h2_conn.h index 7111a6cd69..e45ff317d7 100644 --- a/modules/http2/h2_conn.h +++ b/modules/http2/h2_conn.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_conn_io.c b/modules/http2/h2_conn_io.c index e673a06dcf..eb6ec92313 100644 --- a/modules/http2/h2_conn_io.c +++ b/modules/http2/h2_conn_io.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_conn_io.h b/modules/http2/h2_conn_io.h index 2adf13bf79..2c3be1cde1 100644 --- a/modules/http2/h2_conn_io.h +++ b/modules/http2/h2_conn_io.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_ctx.c b/modules/http2/h2_ctx.c index a3e96514ca..d5ccc24dd6 100644 --- a/modules/http2/h2_ctx.c +++ b/modules/http2/h2_ctx.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_ctx.h b/modules/http2/h2_ctx.h index 3b2c842cae..cb111c9eaa 100644 --- a/modules/http2/h2_ctx.h +++ b/modules/http2/h2_ctx.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_filter.c b/modules/http2/h2_filter.c index 180a4d2347..862c87421a 100644 --- a/modules/http2/h2_filter.c +++ b/modules/http2/h2_filter.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include @@ -537,6 +522,11 @@ int h2_filter_h2_status_handler(request_rec *r) r->clength = -1; r->chunked = 1; apr_table_unset(r->headers_out, "Content-Length"); + /* Discourage content-encodings */ + apr_table_unset(r->headers_out, "Content-Encoding"); + apr_table_setn(r->subprocess_env, "no-brotli", "1"); + apr_table_setn(r->subprocess_env, "no-gzip", "1"); + ap_set_content_type(r, "application/json"); apr_table_setn(r->notes, H2_FILTER_DEBUG_NOTE, "on"); diff --git a/modules/http2/h2_filter.h b/modules/http2/h2_filter.h index 093d4ea3bc..12810d81b7 100644 --- a/modules/http2/h2_filter.h +++ b/modules/http2/h2_filter.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_from_h1.c b/modules/http2/h2_from_h1.c index 3a6bc6d4e8..17d7a1dbd7 100644 --- a/modules/http2/h2_from_h1.c +++ b/modules/http2/h2_from_h1.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_from_h1.h b/modules/http2/h2_from_h1.h index 1b7160a56d..68a24fd70e 100644 --- a/modules/http2/h2_from_h1.h +++ b/modules/http2/h2_from_h1.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c index f206beb788..6f9284b1da 100644 --- a/modules/http2/h2_h2.c +++ b/modules/http2/h2_h2.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_h2.h b/modules/http2/h2_h2.h index fad129abb3..367823d344 100644 --- a/modules/http2/h2_h2.h +++ b/modules/http2/h2_h2.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_headers.c b/modules/http2/h2_headers.c index e80a34f367..94cb214aa3 100644 --- a/modules/http2/h2_headers.c +++ b/modules/http2/h2_headers.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_headers.h b/modules/http2/h2_headers.h index 95e99ee81a..e7e88e3db4 100644 --- a/modules/http2/h2_headers.h +++ b/modules/http2/h2_headers.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index ebe85d6989..dc3418c059 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_mplx.h b/modules/http2/h2_mplx.h index 04ba7a8d77..2890b98579 100644 --- a/modules/http2/h2_mplx.h +++ b/modules/http2/h2_mplx.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_ngn_shed.c b/modules/http2/h2_ngn_shed.c index b536b673f7..fb8577616b 100644 --- a/modules/http2/h2_ngn_shed.c +++ b/modules/http2/h2_ngn_shed.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_ngn_shed.h b/modules/http2/h2_ngn_shed.h index c6acbae253..7764c1897f 100644 --- a/modules/http2/h2_ngn_shed.h +++ b/modules/http2/h2_ngn_shed.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_private.h b/modules/http2/h2_private.h index b68613692d..516be13cbc 100644 --- a/modules/http2/h2_private.h +++ b/modules/http2/h2_private.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c index 0312ff83ad..a077ce1112 100644 --- a/modules/http2/h2_proxy_session.c +++ b/modules/http2/h2_proxy_session.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_proxy_session.h b/modules/http2/h2_proxy_session.h index 20a2db7aeb..ecebb6155f 100644 --- a/modules/http2/h2_proxy_session.h +++ b/modules/http2/h2_proxy_session.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_proxy_util.c b/modules/http2/h2_proxy_util.c index 54cb013f6b..700c915127 100644 --- a/modules/http2/h2_proxy_util.c +++ b/modules/http2/h2_proxy_util.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_proxy_util.h b/modules/http2/h2_proxy_util.h index ea44184256..a88fb7e569 100644 --- a/modules/http2/h2_proxy_util.h +++ b/modules/http2/h2_proxy_util.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_push.c b/modules/http2/h2_push.c index b9a06e3c06..05add9a8cb 100644 --- a/modules/http2/h2_push.c +++ b/modules/http2/h2_push.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_push.h b/modules/http2/h2_push.h index eb122ebf86..bc24e68771 100644 --- a/modules/http2/h2_push.h +++ b/modules/http2/h2_push.h @@ -1,17 +1,19 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. */ + #ifndef __mod_h2__h2_push__ #define __mod_h2__h2_push__ diff --git a/modules/http2/h2_request.c b/modules/http2/h2_request.c index 7f4ab21669..5280e98155 100644 --- a/modules/http2/h2_request.c +++ b/modules/http2/h2_request.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_request.h b/modules/http2/h2_request.h index faf9791194..cc24e5f15a 100644 --- a/modules/http2/h2_request.h +++ b/modules/http2/h2_request.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index 7ea38e34eb..3a80949fa7 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_session.h b/modules/http2/h2_session.h index 7a3ca3ca38..486938b009 100644 --- a/modules/http2/h2_session.h +++ b/modules/http2/h2_session.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c index 0ef45ae304..b2703de712 100644 --- a/modules/http2/h2_stream.c +++ b/modules/http2/h2_stream.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include @@ -593,17 +578,7 @@ void h2_stream_destroy(h2_stream *stream) ap_assert(stream); ap_log_cerror(APLOG_MARK, APLOG_TRACE3, 0, stream->session->c, H2_STRM_MSG(stream, "destroy")); - if (stream->pool) { - apr_pool_destroy(stream->pool); - stream->pool = NULL; - } -} - -apr_pool_t *h2_stream_detach_pool(h2_stream *stream) -{ - apr_pool_t *pool = stream->pool; - stream->pool = NULL; - return pool; + apr_pool_destroy(stream->pool); } apr_status_t h2_stream_prep_processing(h2_stream *stream) diff --git a/modules/http2/h2_stream.h b/modules/http2/h2_stream.h index c3b4b844fd..ba63a3867e 100644 --- a/modules/http2/h2_stream.h +++ b/modules/http2/h2_stream.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. @@ -156,15 +157,6 @@ void h2_stream_dispatch(h2_stream *stream, h2_stream_event_t ev); */ void h2_stream_cleanup(h2_stream *stream); -/** - * Detach the memory pool from the stream. Will prevent stream - * destruction to take the pool with it. - * - * @param stream the stream to detach the pool from - * @result the detached memory pool or NULL if stream no longer has one - */ -apr_pool_t *h2_stream_detach_pool(h2_stream *stream); - /** * Notify the stream that amount bytes have been consumed of its input * since the last invocation of this method (delta amount). diff --git a/modules/http2/h2_switch.c b/modules/http2/h2_switch.c index ef6ae29e08..5e73568eeb 100644 --- a/modules/http2/h2_switch.c +++ b/modules/http2/h2_switch.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_switch.h b/modules/http2/h2_switch.h index 10cee960f6..7be8a239b3 100644 --- a/modules/http2/h2_switch.h +++ b/modules/http2/h2_switch.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_task.c b/modules/http2/h2_task.c index bff7c8aa0e..d69afdfa7e 100644 --- a/modules/http2/h2_task.c +++ b/modules/http2/h2_task.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include diff --git a/modules/http2/h2_task.h b/modules/http2/h2_task.h index a0875574ec..ab6a7469bc 100644 --- a/modules/http2/h2_task.h +++ b/modules/http2/h2_task.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c index 9bf3787db7..3d7ba3796b 100644 --- a/modules/http2/h2_util.c +++ b/modules/http2/h2_util.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h index 01ccccd765..1eb262d288 100644 --- a/modules/http2/h2_util.h +++ b/modules/http2/h2_util.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h index 4cf366f434..a9fdc2fe2d 100644 --- a/modules/http2/h2_version.h +++ b/modules/http2/h2_version.h @@ -1,17 +1,18 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) -* -* Licensed 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. -*/ +/* 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. + */ #ifndef mod_h2_h2_version_h #define mod_h2_h2_version_h @@ -26,7 +27,7 @@ * @macro * Version number of the http2 module as c string */ -#define MOD_HTTP2_VERSION "1.10.14" +#define MOD_HTTP2_VERSION "1.10.16" /** * @macro @@ -34,7 +35,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_HTTP2_VERSION_NUM 0x010a0e +#define MOD_HTTP2_VERSION_NUM 0x010a10 #endif /* mod_h2_h2_version_h */ diff --git a/modules/http2/h2_workers.c b/modules/http2/h2_workers.c index e455612bf4..699f533f80 100644 --- a/modules/http2/h2_workers.c +++ b/modules/http2/h2_workers.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include diff --git a/modules/http2/h2_workers.h b/modules/http2/h2_workers.h index 7964b3c3aa..356158201c 100644 --- a/modules/http2/h2_workers.h +++ b/modules/http2/h2_workers.h @@ -1,12 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/mod_http2.c b/modules/http2/mod_http2.c index 6f785b832b..7881718ad0 100644 --- a/modules/http2/mod_http2.c +++ b/modules/http2/mod_http2.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include #include @@ -68,7 +53,10 @@ AP_DECLARE_MODULE(http2) = { h2_config_create_svr, /* func to create per server config */ h2_config_merge_svr, /* func to merge per server config */ h2_cmds, /* command handlers */ - h2_hooks + h2_hooks, +#if defined(AP_MODULE_FLAG_NONE) + AP_MODULE_FLAG_ALWAYS_MERGE +#endif }; static int h2_h2_fixups(request_rec *r); diff --git a/modules/http2/mod_http2.h b/modules/http2/mod_http2.h index f0cc9567ca..35e141d8a9 100644 --- a/modules/http2/mod_http2.h +++ b/modules/http2/mod_http2.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index c1bb15edb4..07e91ae516 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -14,21 +14,6 @@ * limitations under the License. */ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) - * - * Licensed 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. - */ - #include #include @@ -53,7 +38,10 @@ AP_DECLARE_MODULE(proxy_http2) = { NULL, /* create per-server config structure */ NULL, /* merge per-server config structures */ NULL, /* command apr_table_t */ - register_hook /* register hooks */ + register_hook, /* register hooks */ +#if defined(AP_MODULE_FLAG_NONE) + AP_MODULE_FLAG_ALWAYS_MERGE +#endif }; /* Optional functions from mod_http2 */ diff --git a/modules/http2/mod_proxy_http2.h b/modules/http2/mod_proxy_http2.h index 7da84f0fce..0048ed9042 100644 --- a/modules/http2/mod_proxy_http2.h +++ b/modules/http2/mod_proxy_http2.h @@ -1,11 +1,12 @@ -/* Copyright 2015 greenbytes GmbH (https://www.greenbytes.de) +/* 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 * - * Licensed 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 * - * 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. -- 2.40.0