Received: (from majordom@localhost) by hyperreal.org (8.8.5/8.8.5) id VAA21239; Thu, 25 Sep 1997 21:04:04 -0700 (PDT) Received: from twinlark.arctic.org (twinlark.arctic.org [204.62.130.91]) by hyperreal.org (8.8.5/8.8.5) with SMTP id VAA21213 for ; Thu, 25 Sep 1997 21:03:59 -0700 (PDT) Received: (qmail 4367 invoked by uid 500); 26 Sep 1997 04:03:56 -0000 Date: Thu, 25 Sep 1997 21:03:56 -0700 (PDT) From: Dean Gaudet To: "new-httpd@apache.org" Subject: Re: Apache for OS/2, v1.2.4 (fwd) In-Reply-To: <199709161419.AAA18853@silk.apana.org.au> Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="_=_=_=IMA.BOUNDARY.EGMXCH138764=_=_=_" Content-ID: Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --_=_=_=IMA.BOUNDARY.EGMXCH138764=_=_=_ Content-Type: TEXT/PLAIN; CHARSET=iso-8859-1 Content-ID: I finally had a chance to look at this. I agree with you about the * issues. What if we included a patch file which changed those values to the OS/2 specific values... is it reasonable to expect OS/2 users to have the patch tool when trying to build Apache? Other than the * issues this looks good. Dean On Wed, 17 Sep 1997, Brian Havard wrote: > On Mon, 15 Sep 1997 23:47:50 -0700 (PDT), Dean Gaudet wrote: > > >Sure, the best way to start off would be to post a "diff -u" or "diff -c" > >against 1.2.4. Then after we release 1.3b1 it'd be great if you could > >bring it up to date as well ... unfortunately since we have rearranged the > >code and are in the process of enforcing our style guide via indent you > >won't be able to just apply a patch against 1.3. > > Well, this is what I had to do to get it to compile and run. I've > marked changes that aren't suitable for inclusion in the main > distribution with a *. With these I can either include a replacement > file in the OS/2 distribution or find a better way..... > > ------------------------------------------------------------------------------- > Problem: > Use of S_ISLNK not valid as OS/2 doesn't support symbolic links. > > Proposed Fix: > > Change conf.h to read > > #ifndef S_ISLNK > #ifdef __EMX__ > /* OS/2 doesn't have symlinks so S_ISLNK is always false */ > #define S_ISLNK(m) 0 > #else > #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) > #endif > #endif > > ------------------------------------------------------------------------------- > > Problem: > Target executable needs to be called httpd.exe instead of httpd > > Proposed Fix: > Change Configure: > Add "TARGET=httpd" near start with other variables > Add "TARGET=httpd.exe" in OS/2 section > Add > echo "TARGET=$TARGET" >> Makefile.config > near end with other echo commands. > > Change Makefile.tmpl: > Change all occurences of httpd with $(TARGET) > > > ------------------------------------------------------------------------------- > > Problem: > UFC-crypt library is normally built as ufc.a not libufc.a as given in OS/2 > section of Configure > > Proposed Fix: > Change -llibufc to -lufc in OS/2 section of Configure > > ------------------------------------------------------------------------------- > > Problem: > In OS/2, /bin/sh is not valid (though sh takes care of #!/bin/sh type lines) > > Proposed Fix: > Change Configure: > Add "SHELL=sh" in OS/2 section to allow sh to be found via PATH (by make). > > * Change regex/Makefile: > Change "SHELL = /bin/sh" to "SHELL = sh" > > ------------------------------------------------------------------------------- > > Problem: > OS/2 doesn't have users or groups so checking for root UID isn't too useful. > > Proposed Fix: > Change http_core.c to suppress root check in set_user() using > #if !defined (BIG_SECURITY_HOLE) && !defined (__EMX__) > > ------------------------------------------------------------------------------- > > Problem: > In regex/mkh, PATH=/bin:/usr/bin is pretty useless under OS/2 > > Proposed Fix: > * Change regex/mkh: > Remove PATH= line > > ------------------------------------------------------------------------------- > > Problem: > helpers/CutRule doesn't work without #!/bin/sh at start > > Proposed Fix: > * Change helpers/CutRule: > Add #!/bin/sh at start > > ------------------------------------------------------------------------------- > > Problem: > helpers/PrintPath doesn't work as OS/2 uses ; as path separator instead of : > Also, executable being searched for need .exe on the end. > > Proposed Fix: > * Change helpers/PrintPath: > In sed line, change all : to ; > Put .exe after both $1's in the tests > > ------------------------------------------------------------------------------- > > Summary: > Files changed (diff attached): > conf.h http_core.c Configure Makefile.tmpl > * regex/Makefile regex/mkh helpers/CutRule helpers/PrintPath > > -- > ______________________________________________________________________________ > | Brian Havard | "He is not the messiah! | > | brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian | > ------------------------------------------------------------------------------ > --_=_=_=IMA.BOUNDARY.EGMXCH138764=_=_=_ Content-Type: APPLICATION/OCTET-STREAM; NAME="patch.os2" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: LS0tIC4uXG9yaWdcY29uZi5oCVNhdCBBdWcgMTYgMDM6Mjk6NDggMTk5Nw0KKysrIGNvbmYuaAlU dWUgU2VwIDE2IDE4OjMyOjU2IDE5OTcNCkBAIC02MzAsOCArNjMwLDEwIEBADQogI2VuZGlmDQog DQogI2lmbmRlZiBTX0lTTE5LDQotI2lmbmRlZiBfX0VNWF9fDQotLyogRG9uJ3QgZGVmaW5lIHRo aXMgZm9yIE9TLzIgKi8NCisjaWZkZWYgX19FTVhfXw0KKy8qIE9TLzIgZG9lc24ndCBoYXZlIHN5 bWxpbmtzIHNvIFNfSVNMTksgaXMgYWx3YXlzIGZhbHNlICovDQorI2RlZmluZSBTX0lTTE5LKG0p IDANCisjZWxzZQ0KICNkZWZpbmUgU19JU0xOSyhtKSAoKChtKSAmIFNfSUZNVCkgPT0gU19JRkxO SykNCiAjZW5kaWYNCiAjZW5kaWYNCi0tLSAuLlxvcmlnXGh0dHBfY29yZS5jCVR1ZSBBdWcgIDUg MTg6MjA6NTQgMTk5Nw0KKysrIGh0dHBfY29yZS5jCVR1ZSBTZXAgMTYgMTk6MDc6MzAgMTk5Nw0K QEAgLTg5MCw3ICs4OTAsNyBAQA0KIAkJInJlcXVpcmVzIFNVRVhFQyB3cmFwcGVyLlxuIik7DQog CX0NCiAgICAgfQ0KLSNpZiAhZGVmaW5lZCAoQklHX1NFQ1VSSVRZX0hPTEUpDQorI2lmICFkZWZp bmVkIChCSUdfU0VDVVJJVFlfSE9MRSkgJiYgIWRlZmluZWQgKF9fRU1YX18pDQogICAgIGlmIChj bWQtPnNlcnZlci0+c2VydmVyX3VpZCA9PSAwKSB7DQogCWZwcmludGYgKHN0ZGVyciwNCiAiRXJy b3I6XHRBcGFjaGUgaGFzIG5vdCBiZWVuIGRlc2lnbmVkIHRvIHNlcnZlIHBhZ2VzIHdoaWxlIHJ1 bm5pbmdcbiINCi0tLSAuLlxvcmlnXENvbmZpZ3VyZQlGcmkgQXVnIDIyIDA4OjU2OjIwIDE5OTcN CisrKyBDb25maWd1cmUJV2VkIFNlcCAxNyAwMDoxMDowOCAxOTk3DQpAQCAtMTcsNiArMTcsNyBA QA0KIGZpbGU9Q29uZmlndXJhdGlvbg0KIHRtcGZpbGU9aHRjb25mLiQkDQogbWFrZWZpbGVfdG1w bD1NYWtlZmlsZS50bXBsDQorVEFSR0VUPWh0dHBkDQogDQogd2hpbGUgWyAieCQxIiAhPSAieCIg XTsgZG8NCiAgIGlmIFsgIngkMSIgPSAieC1maWxlIiBdIDsgdGhlbg0KQEAgLTIyNiw5ICsyMjcs MTEgQEANCiAgICAgKk9TLzIqKQ0KIAlERUZfV0FOVEhTUkVHRVg9eWVzDQogCU9TPSdFTVggT1Mv MicNCi0JQ0ZMQUdTPSIkQ0ZMQUdTIC1aYnNkLXNpZ25hbHMgLVpiaW4tZmlsZXMgLURUQ1BJUFY0 IC1nIg0KLQlMSUJTPSIkTElCUyAtbHNvY2tldCAtbGxpYnVmYyAtbGJzZCINCisJQ0ZMQUdTPSIk Q0ZMQUdTIC1aYnNkLXNpZ25hbHMgLVpiaW4tZmlsZXMgLURUQ1BJUFY0Ig0KKwlMSUJTPSIkTElC UyAtbHNvY2tldCAtbHVmYyAtbGJzZCINCisJU0hFTEw9InNoIg0KIAlEQk1fTElCPSItbGdkYm0i DQorCVRBUkdFVD1odHRwZC5leGUNCiAJOzsNCiAgICAgKi1oaS1oaXV4KQ0KIAlPUz0nSEktVVgn DQpAQCAtNjI3LDYgKzYzMCw3IEBADQogZWNobyAiUkVHTElCPSRSRUdMSUIiPj4gTWFrZWZpbGUu Y29uZmlnDQogZWNobyAiUkFOTElCPSRSQU5MSUIiPj4gTWFrZWZpbGUuY29uZmlnDQogZWNobyAi U0hFTEw9JFNIRUxMIj4+IE1ha2VmaWxlLmNvbmZpZw0KK2VjaG8gIlRBUkdFVD0kVEFSR0VUIiA+ PiBNYWtlZmlsZS5jb25maWcNCiBlY2hvID4+IE1ha2VmaWxlLmNvbmZpZw0KIGVjaG8gIiMjIyMg RW5kIG9mIENvbmZpZ3VyZSBjcmVhdGVkIHNlY3Rpb24gIyMjIyI+PiBNYWtlZmlsZS5jb25maWcN CiANCi0tLSAuLlxvcmlnXE1ha2VmaWxlLnRtcGwJVHVlIEp1bCAgMSAxMTozMzozMCAxOTk3DQor KysgTWFrZWZpbGUudG1wbAlNb24gU2VwIDE1IDE2OjIwOjU2IDE5OTcNCkBAIC0xNiw3ICsxNiw3 IEBADQogLmMubzoNCiAJJChDQykgLWMgJChJTkNMVURFUykgJChDRkxBR1MpICQoU1BBQ0VSKSAk PA0KIA0KLWFsbDogQEBDb25maWd1cmF0aW9uQEAgaHR0cGQNCithbGw6IEBAQ29uZmlndXJhdGlv bkBAICQoVEFSR0VUKQ0KIA0KIEBAQ29uZmlndXJhdGlvbkBAOiBDb25maWd1cmF0aW9uLnRtcGwN CiAJQGVjaG8gIkBAQ29uZmlndXJhdGlvbkBAIG9sZGVyIHRoYW4gQ29uZmlndXJhdGlvbi50bXBs LCBvciBkb2Vzbid0IGV4aXN0LiINCkBAIC0yNSw4ICsyNSw4IEBADQogCUBlY2hvICJJZiBub3Qs IHlvdSB3aWxsIGF0IGxlYXN0IGhhdmUgdG8gdG91Y2ggQEBDb25maWd1cmF0aW9uQEAuIg0KIAlA ZmFsc2UNCiANCi1odHRwZDogJChSRUdMSUIpICQoT0JKUykNCi0JJChDQykgJChMRkxBR1MpICAt byBodHRwZCAkKE9CSlMpICQoUkVHTElCKSAkKExJQlMpDQorJChUQVJHRVQpOiAkKFJFR0xJQikg JChPQkpTKQ0KKwkkKENDKSAkKExGTEFHUykgIC1vICQoVEFSR0VUKSAkKE9CSlMpICQoUkVHTElC KSAkKExJQlMpDQogDQogcmVnZXgvbGlicmVnZXguYToNCiAJKGNkIHJlZ2V4OyAkKE1BS0UpIGxp YiBDQz0kKENDKSBBVVhfQ0ZMQUdTPSckKENGTEFHUyknIFJBTkxJQj0nJChSQU5MSUIpJykNCi0t LSAuLlxvcmlnXHJlZ2V4XE1ha2VmaWxlCVN1biBKdWwgMjggMjA6MzI6MTggMTk5Ng0KKysrIHJl Z2V4XE1ha2VmaWxlCU1vbiBTZXAgMTUgMTU6MDk6MTggMTk5Nw0KQEAgLTEsNCArMSw0IEBADQot U0hFTEwgPSAvYmluL3NoDQorU0hFTEwgPSBzaA0KIA0KICMgWW91IHByb2JhYmx5IHdhbnQgdG8g dGFrZSAtRFJFREVCVUcgb3V0IG9mIENGTEFHUywgYW5kIHB1dCBzb21ldGhpbmcgbGlrZQ0KICMg LU8gaW4sICphZnRlciogdGVzdGluZyAoLURSRURFQlVHIHN0cmVuZ3RoZW5zIHRlc3RpbmcgYnkg ZW5hYmxpbmcgYSBsb3Qgb2YNCi0tLSAuLlxvcmlnXHJlZ2V4XG1raAlXZWQgSnVsIDI0IDA4OjA2 OjQ0IDE5OTYNCisrKyByZWdleFxta2gJVHVlIFNlcCAxNiAyMzo1NjoxOCAxOTk3DQpAQCAtMSw2 ICsxLDUgQEANCiAjISAvYmluL3NoDQogIyBta2ggLSBwdWxsIGhlYWRlcnMgb3V0IG9mIEMgc291 cmNlDQotUEFUSD0vYmluOi91c3IvYmluIDsgZXhwb3J0IFBBVEgNCiANCiAjIGVncmVwIHBhdHRl cm4gdG8gcGljayBvdXQgbWFya2VkIGxpbmVzDQogZWdyZXA9J14gPShbIAldfCQpJw0KLS0tIC4u XG9yaWdcaGVscGVyc1xDdXRSdWxlCUZyaSBBcHIgMTggMTI6NDc6MDYgMTk5Nw0KKysrIGhlbHBl cnNcQ3V0UnVsZQlNb24gU2VwIDE1IDE0OjUwOjI0IDE5OTcNCkBAIC0xLDMgKzEsNCBAQA0KKyMh L2Jpbi9zaA0KICMgSGVscGVyIHNjcmlwdCBmb3IgQ29uZmlndXJlIC0gY3V0IGEgcnVsZSBmcm9t IENvbmZpZ3VyYXRpb24uDQogIyBub3RlIHRoYXQgdGhlcmUgaXMgYSB0YWIgYW5kIGEgc3BhY2Ug aW4gdGhlIGNoYXJhY3RlciBncm91cHMuDQogIyBNYXAgdG8gbG93ZXJjYXNlIHRvIG1ha2UgdGVz dHMgZWFzaWVyDQotLS0gLi5cb3JpZ1xoZWxwZXJzXFByaW50UGF0aAlUaHUgSmFuIDMwIDEwOjA3 OjU0IDE5OTcNCisrKyBoZWxwZXJzXFByaW50UGF0aAlUdWUgU2VwIDE2IDIzOjQ2OjA0IDE5OTcN CkBAIC0zMCwxMiArMzAsMTMgQEANCiBmaQ0KIA0KIGZvciBwYXRoIGluIGBlY2hvICRQQVRIIHwN Ci0gc2VkICdzL146Ly46Lw0KLSAgICAgIHMvOjovOi46L2cNCi0gICAgICBzLzokLzouLw0KLSAg ICAgIHMvOi8gL2cnIGANCisgc2VkICdzL147Ly47Lw0KKyAgICAgIHMvOzsvOy47L2cNCisgICAg ICBzLzskLzsuLw0KKyAgICAgIHMvOy8gL2cNCisgICAgICBzL1xcXFwvXFwvL2cnIGANCiBkbw0K LSAgICBpZiBbICR0ZXN0X2V4ZWNfZmxhZyAkcGF0aC8kMSBdICYmIFsgISAtZCAkcGF0aC8kMSBd OyB0aGVuDQorICAgIGlmIFsgJHRlc3RfZXhlY19mbGFnICRwYXRoLyQxLmV4ZSBdICYmIFsgISAt ZCAkcGF0aC8kMS5leGUgXTsgdGhlbg0KICAgICAgICAgaWYgWyAiJGVjaG8iID0gInllcyIgXTsg dGhlbg0KIAkgICAgZWNobyAkcGF0aC8kMQ0KIAlmaQ0K --_=_=_=IMA.BOUNDARY.EGMXCH138764=_=_=_--