You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Gregory Nicholls <gn...@level8.com> on 2000/07/25 23:08:06 UTC
Patch for winnt MPM ??
Hi,
A couple of the files in the winnt mpm (registry.c and service.c) are using
APR_NOTFOUND to indicate missing files. I _think_ they should be using APR_ENOFILE.
My code base has APR_NOTFOUND listed as a missing socket in a poll set.
Now bearing in mind that I've _never_ used CVS before today I've prepared what
I _think_ is a patch for registry.c. If no one dies laughing I'll try service.c as
well.
G.
--------------------------------- cut here
--------------------------------------------
Index: registry.c
===================================================================
RCS file: /home/cvspublic/apache-2.0/src/modules/mpm/winnt/registry.c,v
retrieving revision 1.24
diff -b -B -r1.24 registry.c
184c184
< * The return value is APR_SUCCESS, APR_ENOPATH, APR_NOTFOUND, or the OS error
---
> * The return value is APR_SUCCESS, APR_ENOPATH, APR_ENOFILE, or the OS error
228c228
< rv = APR_NOTFOUND;
---
> rv = APR_ENOFILE;
268c268
< rv = APR_NOTFOUND;
---
> rv = APR_ENOFILE;
RE: Patch for winnt MPM ??
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
> From: greg@raleigh.ibm.com [mailto:greg@raleigh.ibm.com]On Behalf Of
> Greg Ames
>
> Gregory Nicholls wrote:
> >
> > Now bearing in mind that I've _never_ used CVS before
> today I've prepared what
> > I _think_ is a patch for registry.c. If no one dies
> laughing I'll try service.c as
> > well.
> > G.
>
> Being a fellow newbie with a mainframe background (and a fellow Greg -
> dang, there's 4 of us now) I can sympathize with the learning
> curve. A
> quick hint - please use the "-u" flag with cvs diff. On Unix a lot of
> us use .cvsrc files in our home directories where we stash
> all the flags
> so we don't have to think about it. I'm sure cvs on Windows has the
> kind of thing.
>
> Here's what I have in my .cvsrc, inherited from Fred S. and/or Ralf:
>
> checkout -P
> update -P -d
> diff -u -d -b
> co -P
> rdiff -u
> cvs -q -z3
A better list then my own [note to self... flag this message :]
I didn't recognize if you are using Win32 for cvs, if you are, this
info might help also...
Set HOME=C:\WinNT\profiles\%UserName%\unix or whatever you like,
and toss that .cvsrc file in the HOME directory. Same with .ssh, if
you ever need to store keys for the SSH util. Cvs will even play nice
and keep your .cvspass passwords in there.
Re: Patch for winnt MPM ??
Posted by Greg Ames <gr...@raleigh.ibm.com>.
Gregory Nicholls wrote:
>
> Now bearing in mind that I've _never_ used CVS before today I've prepared what
> I _think_ is a patch for registry.c. If no one dies laughing I'll try service.c as
> well.
> G.
Being a fellow newbie with a mainframe background (and a fellow Greg -
dang, there's 4 of us now) I can sympathize with the learning curve. A
quick hint - please use the "-u" flag with cvs diff. On Unix a lot of
us use .cvsrc files in our home directories where we stash all the flags
so we don't have to think about it. I'm sure cvs on Windows has the
kind of thing.
Here's what I have in my .cvsrc, inherited from Fred S. and/or Ralf:
checkout -P
update -P -d
diff -u -d -b
co -P
rdiff -u
cvs -q -z3
Greg
Re: Patch for winnt MPM ??
Posted by Manoj Kasichainula <ma...@io.com>.
On Tue, Jul 25, 2000 at 05:08:06PM -0400, Gregory Nicholls wrote:
> A couple of the files in the winnt mpm (registry.c and service.c)
> are using APR_NOTFOUND to indicate missing files. I _think_ they
> should be using APR_ENOFILE. My code base has APR_NOTFOUND listed
> as a missing socket in a poll set.
Any objection to renaming APR_NOTFOUND? Sounds too vague to me.
Patch for winnt MPM part 2
Posted by Gregory Nicholls <gn...@level8.com>.
Well apparently I didn't make a complete idiot of myself so here's part 2 of the fix.
It's for service.c using diff -u -d -b as suggested by another Greg.
-------------- cut here -------------------
Index: service.c
===================================================================
RCS file: /home/cvspublic/apache-2.0/src/modules/mpm/winnt/service.c,v
retrieving revision 1.19
diff -u -d -b -r1.19 service.c
--- service.c 2000/07/25 00:58:22 1.19
+++ service.c 2000/07/26 12:50:07
@@ -657,7 +657,7 @@
/* Take the given literal name if there is no service entry */
display_name = ap_pstrdup(p, name);
- return APR_NOTFOUND;
+ return APR_ENOFILE;
}
RE: Patch for winnt MPM ??
Posted by "William A. Rowe, Jr." <wr...@lnd.com>.
> From: rbb@covalent.net [mailto:rbb@covalent.net]
> Sent: Tuesday, July 25, 2000 4:08 PM
>
> Gregory,
>
> This looks good to me. I'll try to commit this later today.
> If I don't get to it until tomorrow, don't worry, I will commit it.
Looks good here as well... that would probably be my snafu.
I still need to do a once-over before release 6 (I won't have time
before release 5) but G... feel free to continue submitting patches :)
> On Tue, 25 Jul 2000, Gregory Nicholls wrote:
>
> > Hi,
> > A couple of the files in the winnt mpm (registry.c and
> service.c) are using
> > APR_NOTFOUND to indicate missing files. I _think_ they
> should be using APR_ENOFILE.
> > My code base has APR_NOTFOUND listed as a missing socket in
> a poll set.
> > Now bearing in mind that I've _never_ used CVS before
> today I've prepared what
> > I _think_ is a patch for registry.c. If no one dies
> laughing I'll try service.c as
> > well.
> > G.
> >
> >
> > --------------------------------- cut here
> > --------------------------------------------
> > Index: registry.c
> > ===================================================================
> > RCS file:
> /home/cvspublic/apache-2.0/src/modules/mpm/winnt/registry.c,v
> > retrieving revision 1.24
> > diff -b -B -r1.24 registry.c
> > 184c184
> > < * The return value is APR_SUCCESS, APR_ENOPATH,
> APR_NOTFOUND, or the OS error
> > ---
> > > * The return value is APR_SUCCESS, APR_ENOPATH,
> APR_ENOFILE, or the OS error
> > 228c228
> > < rv = APR_NOTFOUND;
> > ---
> > > rv = APR_ENOFILE;
> > 268c268
> > < rv = APR_NOTFOUND;
> > ---
> > > rv = APR_ENOFILE;
> >
> >
>
>
> ______________________________________________________________
> _________________
> Ryan Bloom rbb@apache.org
> 406 29th St.
> San Francisco, CA 94131
> --------------------------------------------------------------
> -----------------
>
Re: Patch for winnt MPM ??
Posted by rb...@covalent.net.
Gregory,
This looks good to me. I'll try to commit this later today. If I don't
get to it until tomorrow, don't worry, I will commit it.
Ryan
On Tue, 25 Jul 2000, Gregory Nicholls wrote:
> Hi,
> A couple of the files in the winnt mpm (registry.c and service.c) are using
> APR_NOTFOUND to indicate missing files. I _think_ they should be using APR_ENOFILE.
> My code base has APR_NOTFOUND listed as a missing socket in a poll set.
> Now bearing in mind that I've _never_ used CVS before today I've prepared what
> I _think_ is a patch for registry.c. If no one dies laughing I'll try service.c as
> well.
> G.
>
>
> --------------------------------- cut here
> --------------------------------------------
> Index: registry.c
> ===================================================================
> RCS file: /home/cvspublic/apache-2.0/src/modules/mpm/winnt/registry.c,v
> retrieving revision 1.24
> diff -b -B -r1.24 registry.c
> 184c184
> < * The return value is APR_SUCCESS, APR_ENOPATH, APR_NOTFOUND, or the OS error
> ---
> > * The return value is APR_SUCCESS, APR_ENOPATH, APR_ENOFILE, or the OS error
> 228c228
> < rv = APR_NOTFOUND;
> ---
> > rv = APR_ENOFILE;
> 268c268
> < rv = APR_NOTFOUND;
> ---
> > rv = APR_ENOFILE;
>
>
_______________________________________________________________________________
Ryan Bloom rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------