summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-03-01 01:06:36 +0000
committerZeev Suraski <zeev@php.net>2001-03-01 01:06:36 +0000
commitb22a6ef2b1c74ec315ed4d02633c29ef13096e6b (patch)
tree07c6b1c774b0bc7b65553c9f97423860a79c3aa2
parent2da359bb84fe165be4bde5bb14528a34d02beeea (diff)
downloadphp-git-b22a6ef2b1c74ec315ed4d02633c29ef13096e6b.tar.gz
Fix a TSRM bug (possibly fixing a sporadic crash in the timeout window
under Windows) - fix from Ben Mansell
-rw-r--r--TSRM/TSRM.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 0edba20248..d92d1e7f07 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -249,7 +249,7 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
if (!thread_resources) {
allocate_new_resource(&tsrm_tls_table[hash_value], thread_id);
- return ts_resource(id);
+ return ts_resource_ex(id, &thread_id);
/* thread_resources = tsrm_tls_table[hash_value]; */
} else {
do {
@@ -260,7 +260,7 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
thread_resources = thread_resources->next;
} else {
allocate_new_resource(&thread_resources->next, thread_id);
- return ts_resource(id);
+ return ts_resource_ex(id, &thread_id);
/*
* thread_resources = thread_resources->next;
* break;