Skip to content

Commit

Permalink
Merge pull request #222 from viest/dev
Browse files Browse the repository at this point in the history
Fix: free up stale sheets.
  • Loading branch information
viest committed Dec 31, 2019
2 parents d5f632c + 1bcbe7b commit 77a1d16
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 5 deletions.
4 changes: 4 additions & 0 deletions kernel/excel.c
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,10 @@ PHP_METHOD(vtiful_xls, openSheet)
RETURN_NULL();
}

if (obj->read_ptr.sheet_t != NULL) {
xlsxioread_sheet_close(obj->read_ptr.sheet_t);
}

obj->read_ptr.sheet_t = sheet_open(obj->read_ptr.file_t, zs_sheet_name, zl_flag);
}
/* }}} */
Expand Down
24 changes: 20 additions & 4 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2019-12-26</date>
<date>2019-12-31</date>
<time>22:00:00</time>
<version>
<release>1.3.3.1</release>
<api>1.3.3.1</api>
<release>1.3.3.2</release>
<api>1.3.3.2</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
<notes>
- FIX merge cells.
- FIX free up stale sheets.
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -251,6 +251,22 @@
<configureoption default="yes" name="enable-reader" prompt="enable reader supports?" />
</extsrcrelease>
<changelog>
<release>
<date>2019-12-26</date>
<time>22:00:00</time>
<version>
<release>1.3.3.1</release>
<api>1.3.3.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
<notes>
- FIX merge cells.
</notes>
</release>
<release>
<date>2019-12-23</date>
<time>23:00:00</time>
Expand Down
2 changes: 1 addition & 1 deletion php_xlswriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
extern zend_module_entry xlswriter_module_entry;
#define phpext_xlswriter_ptr &xlswriter_module_entry

#define PHP_XLSWRITER_VERSION "1.3.3.1"
#define PHP_XLSWRITER_VERSION "1.3.3.2"

#ifdef PHP_WIN32
# define PHP_VTIFUL_API __declspec(dllexport)
Expand Down

0 comments on commit 77a1d16

Please sign in to comment.