You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Randy Terbush <ra...@zyzzyva.com> on 1997/01/26 22:24:13 UTC
Re: cvs commit: apache/src http_main.c httpd.h
Yep. Go for it.
It also looks like the patch to allow whitespace between coordinates
in mapfiles has passed. If you would like to commit that while you
are in there I'd say go ahead. I'm planning on re-rolling at 3:00PST,
5:00CST, or 6:00EST. Pick one. :)
> Randy Terbush wrote:
> >
> > randy 97/01/26 13:11:57
> >
> > Modified: src http_main.c httpd.h
> > Log:
> > Correct a critical typo and ready to re-roll 1.2b5.
>
> before we do that can I put the sys/time.h fix in conf.h for
> A/UX?
>
>
> >
> > Revision Changes Path
> > 1.114 +1 -1 apache/src/http_main.c
> >
> > Index: http_main.c
> > ===================================================================
> > RCS file: /export/home/cvs/apache/src/http_main.c,v
> > retrieving revision 1.113
> > retrieving revision 1.114
> > diff -C3 -r1.113 -r1.114
> > *** http_main.c 1997/01/25 22:37:11 1.113
> > --- http_main.c 1997/01/26 21:11:53 1.114
> > ***************
> > *** 1607,1613 ****
> > clen = sizeof(sa_client);
> > csd = accept(sd, &sa_client, &clen);
> > } while (csd < 0 && errno == EINTR);
> > ! if (csd < 0) break;
> > log_unixerr("accept", "(client socket)", NULL, server_conf);
> > }
> > }
> > --- 1607,1613 ----
> > clen = sizeof(sa_client);
> > csd = accept(sd, &sa_client, &clen);
> > } while (csd < 0 && errno == EINTR);
> > ! if (csd > 0) break;
> > log_unixerr("accept", "(client socket)", NULL, server_conf);
> > }
> > }
> >
> >
> >
> > 1.83 +1 -1 apache/src/httpd.h
> >
> > Index: httpd.h
> > ===================================================================
> > RCS file: /export/home/cvs/apache/src/httpd.h,v
> > retrieving revision 1.82
> > retrieving revision 1.83
> > diff -C3 -r1.82 -r1.83
> > *** httpd.h 1997/01/26 02:27:17 1.82
> > --- httpd.h 1997/01/26 21:11:55 1.83
> > ***************
> > *** 248,254 ****
> > * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
> > */
> >
> > ! #define SERVER_BASEVERSION "Apache/1.2b6-dev" /* SEE COMMENTS ABOVE */
> > #ifdef SERVER_SUBVERSION
> > #define SERVER_VERSION SERVER_BASEVERSION " " SERVER_SUBVERSION
> > #else
> > --- 248,254 ----
> > * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
> > */
> >
> > ! #define SERVER_BASEVERSION "Apache/1.2b5" /* SEE COMMENTS ABOVE */
> > #ifdef SERVER_SUBVERSION
> > #define SERVER_VERSION SERVER_BASEVERSION " " SERVER_SUBVERSION
> > #else
> >
> >
> >
> >
>
>
> --
> ====================================================================
> Jim Jagielski | jaguNET Access Services
> jim@jaguNET.com | http://www.jaguNET.com/
> "Not the Craw... the CRAW!"