| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Tue, 09 Jun 2015 15:44:51 -0700 | |
| branch | s11-update |
| changeset 4451 | a9174862fe73 |
| permissions | -rw-r--r-- |
|
4451
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
From php community: |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
BUG: https://bugs.php.net/bug.php?id=68676 |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
CODE: http://git.php.net/?p=php-src.git;a=commit;h=24125f0f26f3787c006e4a51611ba33ee3b841cb |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
Created for php 5.3 based on code from the community bug. |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
|
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
|
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
--- php-5.3.29/Zend/zend_ts_hash.c_orig 2014-08-13 12:22:50.000000000 -0700 |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
+++ php-5.3.29/Zend/zend_ts_hash.c 2015-05-20 16:03:20.370320770 -0700 |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
@@ -151,7 +151,7 @@ |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
|
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
#ifdef ZTS |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
tsrm_mutex_free(ht->mx_reader); |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
- tsrm_mutex_free(ht->mx_reader); |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
+ tsrm_mutex_free(ht->mx_writer); |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
#endif |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
} |
|
a9174862fe73
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |