Skip to content

Commit 8601ba7

Browse files
committed
Fixed windows compile error.
1 parent 787f10b commit 8601ba7

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

hprose_reader.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* *
1414
* hprose reader for pecl header file. *
1515
* *
16-
* LastModified: Jan 5, 2016 *
16+
* LastModified: Jan 6, 2016 *
1717
* Author: Ma Bingyao <andot@hprose.com> *
1818
* *
1919
\**********************************************************/
@@ -657,10 +657,11 @@ static zend_always_inline void hprose_reader_read_object_without_tag(hprose_read
657657
zend_class_entry *scope = __create_php_object(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), return_value TSRMLS_CC, "");
658658
hprose_reader_refer_set(_this->refer, return_value);
659659
if (i) {
660-
zend_hash_internal_pointer_reset(props_ht);
661-
662660
zend_class_entry *old_scope = EG(scope);
663661
EG(scope) = scope;
662+
663+
zend_hash_internal_pointer_reset(props_ht);
664+
664665
if (!Z_OBJ_HT_P(return_value)->write_property) {
665666
zend_error_noreturn(E_CORE_ERROR, "Properties of class %s cannot be updated", Z_STRVAL_P(class_name));
666667
}

package.xml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,18 @@ http://pear.php.net/dtd/package-2.0.xsd">
4646
<email>mabingyao@gmail.com</email>
4747
<active>yes</active>
4848
</lead>
49-
<date>2016-01-05</date>
50-
<time>23:04:44</time>
49+
<date>2016-01-06</date>
50+
<time>10:08:11</time>
5151
<version>
52-
<release>1.6.2</release>
53-
<api>1.6.2</api>
52+
<release>1.6.3</release>
53+
<api>1.6.3</api>
5454
</version>
5555
<stability>
5656
<release>stable</release>
5757
<api>stable</api>
5858
</stability>
5959
<license uri="http://mit-license.org/">MIT</license>
60-
<notes>Fixed some memory leaks.
61-
Fixed properties serialization with first capital letter.
60+
<notes>Fixed windows compile error.
6261
</notes>
6362
<contents>
6463
<dir name="/">
@@ -113,6 +112,20 @@ http://pear.php.net/dtd/package-2.0.xsd">
113112
<configureoption default="yes" name="enable-hprose" prompt="whether to enable hprose support" />
114113
</extsrcrelease>
115114
<changelog>
115+
<release>
116+
<version>
117+
<release>1.6.3</release>
118+
<api>1.6.3</api>
119+
</version>
120+
<stability>
121+
<release>stable</release>
122+
<api>stable</api>
123+
</stability>
124+
<date>2016-01-06</date>
125+
<license uri="http://mit-license.org/">MIT</license>
126+
<notes>Fixed windows compile error.
127+
</notes>
128+
</release>
116129
<release>
117130
<version>
118131
<release>1.6.2</release>

php_hprose.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ zend_module_entry hprose_module_entry;
3030

3131
#define PHP_HPROSE_MODULE_NAME "hprose"
3232
#define PHP_HPROSE_BUILD_DATE __DATE__ " " __TIME__
33-
#define PHP_HPROSE_VERSION "1.6.2"
33+
#define PHP_HPROSE_VERSION "1.6.3"
3434
#define PHP_HPROSE_AUTHOR "Ma Bingyao"
3535
#define PHP_HPROSE_HOMEPAGE "https://github.com/hprose/hprose-pecl"
3636

0 commit comments

Comments
 (0)