Commit d1203257 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Fix a mod_ssl build problem on OS/390. 

This is admittedly rather ugly code to come up with a unique 4-byte
identifier for the thread.  Since our threads are pthreads and a pthread
maps 1:1 to a TCB, the address of the TCB is sufficient.   Yes, every
TCB sees a different piece of real storage mapped to the first page,
so the code does make sense.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95016 13f79535-47bb-0310-9956-ffa450edef68
parent 083c9c3f

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.37









  *) Fix a mod_ssl build problem on OS/390.  [Jeff Trawick]

















  *) Fixed If-Modified-Since on Win32, which would give false positives









     because of the sub-second resolution of file timestamps on that









     platform.  [Cliff Woolley]


































modules/ssl/ssl_util.c



+13
−0



























Changes for modules/ssl/ssl_util.c: 13 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -419,7 +419,20 @@ static void ssl_util_thr_lock(int mode, int type,

















static unsigned long ssl_util_thr_id(void)









{









    /* OpenSSL needs this to return an unsigned long.  On OS/390, the pthread 









     * id is a structure twice that big.  Use the TCB pointer instead as a 









     * unique unsigned long.









     */









#ifdef __MVS__









    struct PSA {









        char unmapped[540];









        unsigned long PSATOLD;









    } *psaptr = 0;



















    return psaptr->PSATOLD;









#else









    return (unsigned long) apr_os_thread_current();









#endif









}



















static apr_status_t ssl_util_thread_cleanup(void *data)