Commit 2176bab0 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r165151 from trunk: 

* modules/mappers/mod_userdir.c (get_suexec_id_doer): Fix allocation
size.

PR: 34588
Reviewed by: jorton, bnicholes, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@189561 13f79535-47bb-0310-9956-ffa450edef68
parent 92139e63

CHANGES

+4 −1
Original line number Diff line number Diff line 
Changes with Apache 2.0.55













  *) mod_userdir: Fix possible memory corruption issue.  PR 34588.













     [David Leonard <dleonard vintela.com>]



























  *) worker mpm: don't take down the whole server for a transient















     thread creation failure. PR 34514 [Greg Ames]















  

































STATUS



+1
−7






























Original line number
Diff line number
Diff line








@@ -235,12 +235,6 @@ PATCHES TO BACKPORT FROM TRUNK:













        PR: 34452















        +1: jorton





























     *) mod_userdir: fix to palloc(sizeof struct) not palloc(sizeof pointer)













        http://svn.apache.org/viewcvs?rev=165151&view=rev













        PR: 34588













        +1: jorton, bnicholes, trawick (isn't it worth a CHANGES entry for a storage













            corruption fix?)





























     *) fix z/OS annoyance with pathname on debug messages in error log















        http://svn.apache.org/viewcvs?rev=178299&view=rev















        +1: trawick









@@ -267,7 +261,7 @@ PATCHES TO BACKPORT FROM TRUNK:













        to getting a directory listing when a file was requested.  PR 34512.















        2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev















        2.0 version: http://people.apache.org/~trawick/179704-20.txt













        +1: trawick













        +1: trawick, jorton































     *) mod_mime_magic: Handle CRLF-format magic files so that it works with















        the default installation on Windows. 

































modules/mappers/mod_userdir.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -330,7 +330,7 @@ static ap_unix_identity_t *get_suexec_id_doer(const request_rec *r)













        return NULL;















    }





























    if ((ugid = apr_palloc(r->pool, sizeof(ap_unix_identity_t *))) == NULL) {













    if ((ugid = apr_palloc(r->pool, sizeof(*ugid))) == NULL) {















        return NULL;















    }