On Fri, Dec 30, 2016 at 9:00 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote: > On Dec 30, 2016 06:20, <drugg...@apache.org> wrote: > > Author: druggeri > Date: Fri Dec 30 14:20:48 2016 > New Revision: 1776575 > > URL: http://svn.apache.org/viewvc?rev=1776575&view=rev > Log: > Merge new PROXY protocol code into mod_remoteip > > Modified: > httpd/httpd/trunk/docs/log-message-tags/next-number > httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml > httpd/httpd/trunk/modules/metadata/mod_remoteip.c > > > ============================================================================== > --- httpd/httpd/trunk/modules/metadata/mod_remoteip.c (original) > +++ httpd/httpd/trunk/modules/metadata/mod_remoteip.c Fri Dec 30 14:20:48 > 2016 > @@ -12,15 +12,20 @@ > * 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. > + * > + * The majority of the input filter code for PROXY protocol support is > + * Copyright 2014 Cloudzilla Inc. > */ > > > -1 (yes, veto.) > > In general, as the original author of this particular module, you might > notice I don't claim attribution. We rely on svn provenance and Changes to > describe code legacy, so these make me very uncomfortable, especially when > injected into our sources. That isn't the key issue. > > The statement itself may be presently true. The statement a number of years > from now might be radically false. The presence of this statement makes it > impossible for the future svn hacker to know when to modify the statement or > determine when the sources have changed such that it becomes untrue. > > It is a relativistic value judgement, and these aren't useful as legalistic > elements, so the conventional 'portions copyright...' sort of language is > used instead.
Maybe something like this (for a start?) I think we have to keep something here. Index: modules/metadata/mod_remoteip.c =================================================================== --- modules/metadata/mod_remoteip.c (revision 1776673) +++ modules/metadata/mod_remoteip.c (working copy) @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * The majority of the input filter code for PROXY protocol support is - * Copyright 2014 Cloudzilla Inc. + * Portions Copyright 2014 Cloudzilla Inc.: + * remoteip_input_filter() based on mod_proxy_protocol + * https://github.com/roadrunner2/mod-proxy-protocol 62d2df6 */ #include "ap_config.h" -- Eric Covener cove...@gmail.com
