components/php-5_2/php-sapi/patches/70_php-Zend-zend_ts_hash.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Fri, 12 Jun 2015 09:25:50 -0700
branchs11u2-sru
changeset 4475 ae2aef15d437
permissions -rw-r--r--
20293317 problem in UTILITY/PHP 20433646 problem in UTILITY/PHP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4475
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
From php community:
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
BUG: https://bugs.php.net/bug.php?id=68676
ae2aef15d437 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=24125f0f26f3787c006e4a51611ba33
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
ee3b841cb
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
Created this patch based on the community bug/code above.
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
--- php-5.2.17/Zend/zend_ts_hash.c_orig	2015-06-08 09:49:17.630343098 -0700
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
+++ php-5.2.17/Zend/zend_ts_hash.c	2015-06-08 09:49:48.515516637 -0700
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
@@ -151,7 +151,7 @@
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
 
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
 #ifdef ZTS
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
 	tsrm_mutex_free(ht->mx_reader);
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
-	tsrm_mutex_free(ht->mx_reader);
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
+	tsrm_mutex_free(ht->mx_writer);
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
 #endif
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    17
 }
ae2aef15d437 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    18