httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq/lib/Apache libapreq.pm
Date Tue, 24 Feb 2004 17:42:21 GMT
joes        2004/02/24 09:42:21

  Modified:    .        Changes NOTICE libapreq.pod typemap
               Cookie   Cookie.pm Cookie.xs
               Request  Request.pm Request.xs
               c        apache_request.c
               eg/c/testapreq mod_testapreq.c
               eg/perl  cookie.pl file_upload.pl
               lib/Apache libapreq.pm
  Log:
  Update Perl API licenses to ALv2, removing AUTHOR info from documentation per
  instructions at http://www.apache.org/dev/apply-license.html.
  Also apply pending fixes:
    1) Content-Type parser in apache_request.c (Opera 7.20 supplies extra attributes).
    2) Apache::Request->instance returns undef if passed  object is undef.
  
  Revision  Changes    Path
  1.62      +13 -0     httpd-apreq/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Changes,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Changes	11 Feb 2004 03:20:59 -0000	1.61
  +++ Changes	24 Feb 2004 17:42:20 -0000	1.62
  @@ -2,6 +2,19 @@
   
   =over 4
   
  +=item 1.33
  +
  +Upgrade license to the Apache License Version 2.0. [davidw, joes]
  +
  +=item 1.32
  +
  +Fix mfd's Content-Type parser to deal with Opera 7.2's extra attributes.
  +For details see
  +
  +  http://marc.theaimsgroup.com/?l=apreq-dev&m=106606052700407&w=2
  +
  +Bug first reported by Sven Geisler [joes].
  +
   =item 1.31 - ongoing
   
   added a proper implementation of the ithreads support. At the same
  
  
  
  1.2       +1 -1      httpd-apreq/NOTICE
  
  Index: NOTICE
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/NOTICE,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NOTICE	23 Feb 2004 19:57:19 -0000	1.1
  +++ NOTICE	24 Feb 2004 17:42:20 -0000	1.2
  @@ -1,2 +1,2 @@
   This product includes software developed by
  -The Apache Software Foundation (http://www.apache.org/).
  \ No newline at end of file
  +The Apache Software Foundation (http://www.apache.org/).
  
  
  
  1.8       +14 -2     httpd-apreq/libapreq.pod
  
  Index: libapreq.pod
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/libapreq.pod,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- libapreq.pod	24 Nov 2002 01:07:48 -0000	1.7
  +++ libapreq.pod	24 Feb 2004 17:42:20 -0000	1.8
  @@ -354,7 +354,19 @@
   
   This library is based on Perl modules by Lincoln Stein.
   
  -=head1 AUTHOR
  +=head1 LICENSE
   
  -Doug MacEachern, updated for v1.0 by Joe Schaefer
  +  Copyright 2000-2004  The Apache Software Foundation
  +
  +  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.
   
  
  
  
  1.4       +15 -0     httpd-apreq/typemap
  
  Index: typemap
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/typemap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- typemap	11 Feb 2004 03:20:59 -0000	1.3
  +++ typemap	24 Feb 2004 17:42:20 -0000	1.4
  @@ -1,3 +1,18 @@
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
  +
   Apache::Request		T_APROBJ
   Apache::Cookie		T_COOKIEOBJ
   Apache::Upload		T_PTROBJ
  
  
  
  1.11      +30 -3     httpd-apreq/Cookie/Cookie.pm
  
  Index: Cookie.pm
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Cookie/Cookie.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Cookie.pm	25 Sep 2003 15:27:10 -0000	1.10
  +++ Cookie.pm	24 Feb 2004 17:42:20 -0000	1.11
  @@ -1,3 +1,19 @@
  +# NOTE TO MAINTAINERS: license boilerplate appears twice in this file
  +
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
   package Apache::Cookie;
   
   use strict;
  @@ -165,7 +181,18 @@
   
   Apache(3), Apache::Request(3), CGI::Cookie(3)
   
  -=head1 AUTHOR
  +=head1 LICENSE
  +
  +   Copyright 2000-2004  The Apache Software Foundation
  +
  +   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
   
  -Doug MacEachern, updated for v1.0 by Joe Schaefer
  -updated for v1.1 by Issac Goldstand
  +   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.
  
  
  
  1.9       +15 -0     httpd-apreq/Cookie/Cookie.xs
  
  Index: Cookie.xs
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Cookie/Cookie.xs,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Cookie.xs	11 Feb 2004 03:20:59 -0000	1.8
  +++ Cookie.xs	24 Feb 2004 17:42:20 -0000	1.9
  @@ -1,3 +1,18 @@
  +/* Copyright 2000-2004  The Apache Software Foundation
  +**
  +** 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.
  +*/
  +
   #define PERL_NO_GET_CONTEXT     /* we want efficiency */
   #include "apache_cookie.h"
   
  
  
  
  1.28      +34 -3     httpd-apreq/Request/Request.pm
  
  Index: Request.pm
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Request/Request.pm,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Request.pm	25 Sep 2003 15:27:10 -0000	1.27
  +++ Request.pm	24 Feb 2004 17:42:20 -0000	1.28
  @@ -1,3 +1,19 @@
  +# NOTE TO MAINTAINERS: license boilerplate appears twice in this file
  +
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
   package Apache::Request;
   
   use strict;
  @@ -16,9 +32,11 @@
   sub instance {
       my $class = shift;
       my $r = shift;
  +    return unless defined $r;
       if (my $apreq = $r->pnotes('apreq')) {
           return $apreq;
       }
  +
       my $new_req = $class->new($r, @_);
       $r->pnotes('apreq', $new_req);
       return $new_req;
  @@ -400,7 +418,20 @@
   
   This interface is based on the original pure Perl version by Lincoln Stein.
   
  -=head1 AUTHOR
  +=head1 LICENSE
  +
  +   Copyright 2000-2004  The Apache Software Foundation
  +
  +   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.
  +
   
  -Doug MacEachern, updated for v1.0 by Joe Schaefer, updated for v1.2 by
  -Steve Hay.
  
  
  
  1.39      +15 -0     httpd-apreq/Request/Request.xs
  
  Index: Request.xs
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/Request/Request.xs,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Request.xs	11 Feb 2004 03:20:59 -0000	1.38
  +++ Request.xs	24 Feb 2004 17:42:20 -0000	1.39
  @@ -1,3 +1,18 @@
  +/* Copyright 2000-2004  The Apache Software Foundation
  +**
  +** 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.
  +*/
  +
   #define PERL_NO_GET_CONTEXT     /* we want efficiency */
   #include "apache_request.h"
   #include "patchlevel.h"
  
  
  
  1.29      +11 -1     httpd-apreq/c/apache_request.c
  
  Index: apache_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/c/apache_request.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- apache_request.c	23 Feb 2004 19:57:19 -0000	1.28
  +++ apache_request.c	24 Feb 2004 17:42:20 -0000	1.29
  @@ -494,7 +494,17 @@
   	return HTTP_REQUEST_ENTITY_TOO_LARGE;
       }
   
  -    (void)ap_getword(r->pool, &ct, '=');
  +    do {
  +        int blen;
  +        boundary = ap_getword(r->pool, &ct, '=');
  +        if (boundary == NULL)
  +            return DECLINED;
  +        blen = strlen(boundary);
  +        if (blen == 0 || blen < strlen("boundary"))
  +            return DECLINED;
  +        boundary += blen - strlen("boundary");
  +    } while (strcasecmp(boundary,"boundary") != 0);
  +
       boundary = ap_getword_conf(r->pool, &ct);
   
       if (!(mbuff = multipart_buffer_new(boundary, length, r))) {
  
  
  
  1.3       +15 -0     httpd-apreq/eg/c/testapreq/mod_testapreq.c
  
  Index: mod_testapreq.c
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/eg/c/testapreq/mod_testapreq.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_testapreq.c	12 Jun 2001 22:46:40 -0000	1.2
  +++ mod_testapreq.c	24 Feb 2004 17:42:21 -0000	1.3
  @@ -1,3 +1,18 @@
  +/*  Copyright 2000-2004  The Apache Software Foundation
  +**
  +**  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 "apache_request.h"
   #include "apache_cookie.h"
   
  
  
  
  1.2       +14 -0     httpd-apreq/eg/perl/cookie.pl
  
  Index: cookie.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/eg/perl/cookie.pl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cookie.pl	27 Jan 1999 01:33:20 -0000	1.1
  +++ cookie.pl	24 Feb 2004 17:42:21 -0000	1.2
  @@ -1,3 +1,17 @@
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
   use strict;
   use Apache::Cookie ();
   use Apache::Request ();
  
  
  
  1.4       +14 -0     httpd-apreq/eg/perl/file_upload.pl
  
  Index: file_upload.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/eg/perl/file_upload.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- file_upload.pl	10 Jan 2001 18:57:13 -0000	1.3
  +++ file_upload.pl	24 Feb 2004 17:42:21 -0000	1.4
  @@ -1,3 +1,17 @@
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
   use strict;
   use Apache::Request ();
   
  
  
  
  1.5       +33 -0     httpd-apreq/lib/Apache/libapreq.pm
  
  Index: libapreq.pm
  ===================================================================
  RCS file: /home/cvs/httpd-apreq/lib/Apache/libapreq.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libapreq.pm	25 Sep 2003 15:27:10 -0000	1.4
  +++ libapreq.pm	24 Feb 2004 17:42:21 -0000	1.5
  @@ -1,3 +1,19 @@
  +# NOTE TO MAINTAINERS: license boilerplate apprears twice in this file
  +
  +#  Copyright 2000-2004  The Apache Software Foundation
  +#
  +#  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.
  +
   package Apache::libapreq;
   $VERSION = '1.3';
   
  @@ -68,3 +84,20 @@
   =head1 AUTHOR
   
   Doug MacEachern
  +
  +=head1 LICENSE
  +
  +  Copyright 2000-2004  The Apache Software Foundation
  +
  +  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.
  +
  
  
  

Mime
View raw message