RE: [PHP-CVS] cvs: php4(PHP_4_3) /main rfc1867.c presentations/slides/intro numbers.xml phpstats.png

[James Cox]

Rasmus,

if you look in the cvslog.pl file, there is a notice saying that it can't
handle more than one commit at the same time.... we need a lock in there to
deal with this.. (was just talking to ilia about it). This does happen a
fair few times... it's nothing to panic about.

 -- james

>
> Uh, what the hell?  Our two close to simultaneous commits ended up in a
> single commit email coming from you?  There is also no PHP_4_3 branch
> under /presentations.  Very very weird!  Must be some sort of race
> condition on the temporary files CVS generates?
>
> -Rasmus
>
> On Wed, 5 Mar 2003, Ilia Alshanetsky wrote:
>
> > iliaa               Wed Mar  5 12:00:27 2003 EDT
> >
> >   Modified files:              (Branch: PHP_4_3)
> >     /presentations/slides/intro     numbers.xml phpstats.png
> >     /php4/main      rfc1867.c
> >   Log:
> >   MFH
> >
> >
> > Index: presentations/slides/intro/numbers.xml
> > diff -u presentations/slides/intro/numbers.xml:1.9
> presentations/slides/intro/numbers.xml:1.10
> > --- presentations/slides/intro/numbers.xml:1.9      Mon Feb 10
> 16:21:41 2003
> > +++ presentations/slides/intro/numbers.xml  Wed Mar  5 12:00:23 2003
> > @@ -1,26 +1,26 @@
> >  <slide title="PHP Usage Growth">
> >  <list>
> > -<title>January 2003 Netcraft Report</title>
> > -<bullet>35,424,956 Domains queried</bullet>
> > -<bullet> 10,258,692 Domains.  1,211,575 IP addresses</bullet>
> > -<bullet>PHP installed on 28.96% of all domains</bullet>
> > +<title>February 2003 Netcraft Report</title>
> > +<bullet>35,863,952 Domains queried</bullet>
> > +<bullet> 10,519,623 Domains.  1,220,927 IP addresses</bullet>
> > +<bullet>PHP installed on 29.33% of all domains</bullet>
> >  </list>
> >  <image filename="phpstats.png" align="center"/>
> >  <link href="http://www.netcraft.com"; leader="Source: "
> align="right" marginright="6em">Netcraft</link>
> >
> >  <list>
> > -<title>January 2003 Apache Module Report</title>
> > -<bullet>%5,507,803 Apache Servers surveyed%</bullet>
> > -<bullet>%2,815,981 (51.13\%) PHP%</bullet>
> > -<bullet>%1,677,050 (30.45\%) OpenSSL%</bullet>
> > -<bullet>%1,616,924 (29.36\%) mod_ssl%</bullet>
> > -<bullet>%1,221,884 (22.18\%) Frontpage%</bullet>
> > -<bullet>%1,218,155 (22.12\%) mod_perl%</bullet>
> > -<bullet>%  325,883  (5.92\%) DAV%</bullet>
> > -<bullet>%  275,404  (5.00\%) mod_throttle%</bullet>
> > -<bullet>%  156,168  (2.84\%) AuthMySQL%</bullet>
> > -<bullet>%  150,502  (2.73\%) mod_auth_pam%</bullet>
> > -<bullet>%  137,592  (2.50\%) mod_jk%</bullet>
> > +<title>February 2003 Apache Module Report</title>
> > +<bullet>%5,852,747 Apache Servers surveyed%</bullet>
> > +<bullet>%2,998,762 (51.24\%) PHP%</bullet>
> > +<bullet>%1,765,800 (30.17\%) OpenSSL%</bullet>
> > +<bullet>%1,703,290 (29.10\%) mod_ssl%</bullet>
> > +<bullet>%1,269,545 (21.69\%) Frontpage%</bullet>
> > +<bullet>%1,255,480 (21.45\%) mod_perl%</bullet>
> > +<bullet>%  348,783  (5.96\%) DAV%</bullet>
> > +<bullet>%  296,899  (5.07\%) mod_throttle%</bullet>
> > +<bullet>%  167,790  (2.87\%) AuthMySQL%</bullet>
> > +<bullet>%  159,416  (2.72\%) mod_auth_pam%</bullet>
> > +<bullet>%  156,354  (2.67\%) mod_jk%</bullet>
> >  </list>
> >  <link
> href="http://www.securityspace.com/s_survey/data/index.html";
> leader="Source: ">SecuritySpace.com</link>
> >
> > Index: presentations/slides/intro/phpstats.png
> > Index: php4/main/rfc1867.c
> > diff -u php4/main/rfc1867.c:1.122.2.8 php4/main/rfc1867.c:1.122.2.9
> > --- php4/main/rfc1867.c:1.122.2.8   Tue Dec 31 11:26:24 2002
> > +++ php4/main/rfc1867.c     Wed Mar  5 12:00:24 2003
> > @@ -16,7 +16,7 @@
> >     |          Jani Taskinen <[EMAIL PROTECTED]>
>            |
> >
> +----------------------------------------------------------------------+
> >   */
> > -/* $Id: rfc1867.c,v 1.122.2.8 2002/12/31 16:26:24 sebastian Exp $ */
> > +/* $Id: rfc1867.c,v 1.122.2.9 2003/03/05 17:00:24 iliaa Exp $ */
> >
> >  /*
> >   *  This product includes software developed by the Apache Group
> > @@ -857,7 +857,7 @@
> >
> >                     while (!cancel_upload && (blen =
> multipart_buffer_read(mbuff, buff, sizeof(buff) TSRMLS_CC)))
> >                     {
> > -                           if (total_bytes > PG(upload_max_filesize)) {
> > +                           if (PG(upload_max_filesize) > 0 &&
> total_bytes > PG(upload_max_filesize)) {
> >
> sapi_module.sapi_error(E_WARNING, "upload_max_filesize of %ld
> bytes exceeded - file [%s=%s] not saved",
> PG(upload_max_filesize), param, filename);
> >                                     cancel_upload = UPLOAD_ERROR_A;
> >                             } else if (max_file_size &&
> (total_bytes > max_file_size)) {
> >
> >
> >
> >
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php