Mercurial > hg > nginx
comparison src/core/ngx_shmtx.c @ 4956:bbcaeccbd928 stable-1.2
Merge of r4933, r4933: shared memory fixes.
*) Fixed location of debug message in ngx_shmtx_lock().
*) Core: don't reuse shared memory zone that changed ownership (ticket #210).
nginx doesn't allow the same shared memory zone to be used for different
purposes, but failed to check this on reconfiguration. If a shared memory
zone was used for another purpose in the new configuration, nginx attempted
to reuse it and crashed.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 10 Dec 2012 18:17:32 +0000 |
| parents | 924d536a8eed |
| children | 74edc0ccf27a |
comparison
equal
deleted
inserted
replaced
| 4955:2e4e4084b562 | 4956:bbcaeccbd928 |
|---|---|
| 115 if (err != NGX_EINTR) { | 115 if (err != NGX_EINTR) { |
| 116 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, | 116 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err, |
| 117 "sem_wait() failed while waiting on shmtx"); | 117 "sem_wait() failed while waiting on shmtx"); |
| 118 break; | 118 break; |
| 119 } | 119 } |
| 120 | |
| 121 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
| 122 "shmtx awoke"); | |
| 123 } | 120 } |
| 121 | |
| 122 ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, | |
| 123 "shmtx awoke"); | |
| 124 | 124 |
| 125 continue; | 125 continue; |
| 126 } | 126 } |
| 127 | 127 |
| 128 #endif | 128 #endif |