Skip to content

Commit b1de7fc

Browse files
zsuraskizsuraski
committed
More TSRMLS_FETCH annihilation. Enough for today...
1 parent bc42c37 commit b1de7fc

26 files changed

+83
-91
lines changed

‎ext/db/db.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
307307
return NULL;
308308
}
309309

310-
if (php_check_open_basedir(filename)) {
310+
if (php_check_open_basedir(filename TSRMLS_CC)) {
311311
return NULL;
312312
}
313313

‎ext/dbase/dbase.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ PHP_FUNCTION(dbase_open) {
132132
RETURN_FALSE;
133133
}
134134

135-
if (php_check_open_basedir(dbf_name->value.str.val)) {
135+
if (php_check_open_basedir(dbf_name->value.str.val TSRMLS_CC)) {
136136
RETURN_FALSE;
137137
}
138138

@@ -599,7 +599,7 @@ PHP_FUNCTION(dbase_create) {
599599
RETURN_FALSE;
600600
}
601601

602-
if (php_check_open_basedir(Z_STRVAL_P(filename))) {
602+
if (php_check_open_basedir(Z_STRVAL_P(filename) TSRMLS_CC)) {
603603
RETURN_FALSE;
604604
}
605605

‎ext/filepro/filepro.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ PHP_FUNCTION(filepro)
218218
RETURN_FALSE;
219219
}
220220

221-
if (php_check_open_basedir(workbuf)) {
221+
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
222222
RETURN_FALSE;
223223
}
224224

@@ -316,7 +316,7 @@ PHP_FUNCTION(filepro_rowcount)
316316
RETURN_FALSE;
317317
}
318318

319-
if (php_check_open_basedir(workbuf)) {
319+
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
320320
RETURN_FALSE;
321321
}
322322

@@ -540,7 +540,7 @@ PHP_FUNCTION(filepro_retrieve)
540540
RETURN_FALSE;
541541
}
542542

543-
if (php_check_open_basedir(workbuf)) {
543+
if (php_check_open_basedir(workbuf TSRMLS_CC)) {
544544
RETURN_FALSE;
545545
}
546546

‎ext/gd/gd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ PHP_FUNCTION(imageloadfont)
409409
#ifdef PHP_WIN32
410410
fp = VCWD_FOPEN(Z_STRVAL_PP(file), "rb");
411411
#else
412-
fp = php_fopen_wrapper(Z_STRVAL_PP(file), "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL);
412+
fp = php_fopen_wrapper(Z_STRVAL_PP(file), "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL TSRMLS_CC);
413413
#endif
414414
if (fp == NULL) {
415415
php_error(E_WARNING, "ImageFontLoad: unable to open file");
@@ -1100,7 +1100,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
11001100
#ifdef PHP_WIN32
11011101
fp = VCWD_FOPEN(fn, "rb");
11021102
#else
1103-
fp = php_fopen_wrapper(fn, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL);
1103+
fp = php_fopen_wrapper(fn, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL TSRMLS_CC);
11041104
#endif
11051105
if (!fp && !socketd) {
11061106
php_strip_url_passwd(fn);
@@ -1312,7 +1312,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char
13121312
}
13131313

13141314
if ((argc == 2) || (argc == 3 && Z_STRLEN_PP(file))) {
1315-
if (!fn || fn == empty_string || php_check_open_basedir(fn)) {
1315+
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
13161316
php_error(E_WARNING, "%s: invalid filename '%s'", get_active_function_name(TSRMLS_C), fn);
13171317
RETURN_FALSE;
13181318
}
@@ -3404,13 +3404,13 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type )
34043404
}
34053405

34063406
/* Check origin file */
3407-
if (!fn_org || fn_org == empty_string || php_check_open_basedir(fn_org)) {
3407+
if (!fn_org || fn_org == empty_string || php_check_open_basedir(fn_org TSRMLS_CC)) {
34083408
php_error (E_WARNING, "%s: invalid origin filename '%s'", get_active_function_name(TSRMLS_C), fn_org);
34093409
RETURN_FALSE;
34103410
}
34113411

34123412
/* Check destination file */
3413-
if (!fn_dest || fn_dest == empty_string || php_check_open_basedir(fn_dest)) {
3413+
if (!fn_dest || fn_dest == empty_string || php_check_open_basedir(fn_dest TSRMLS_CC)) {
34143414
php_error (E_WARNING, "%s: invalid destination filename '%s'", get_active_function_name(TSRMLS_C), fn_dest);
34153415
RETURN_FALSE;
34163416
}

‎ext/gd/gd_ctx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
4949
}
5050

5151
if ((argc == 2) || (argc == 3 && Z_STRLEN_PP(file))) {
52-
if (!fn || fn == empty_string || php_check_open_basedir(fn)) {
52+
if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
5353
php_error(E_WARNING, "%s: invalid filename '%s'", get_active_function_name(TSRMLS_C), fn);
5454
RETURN_FALSE;
5555
}

‎ext/hyperwave/hw.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2800,7 +2800,8 @@ PHP_FUNCTION(hw_insertdocument) {
28002800

28012801
/* {{{ proto hwdoc hw_new_document(string objrec, string data, int size)
28022802
Create a new document */
2803-
PHP_FUNCTION(hw_new_document) {
2803+
PHP_FUNCTION(hw_new_document)
2804+
{
28042805
pval *arg1, *arg2, *arg3;
28052806
char *ptr;
28062807
hw_document *doc;
@@ -2835,7 +2836,8 @@ PHP_FUNCTION(hw_new_document) {
28352836
#define BUFSIZE 8192
28362837
/* {{{ proto hwdoc hw_new_document_from_file(string objrec, string filename)
28372838
Create a new document from a file */
2838-
PHP_FUNCTION(hw_new_document_from_file) {
2839+
PHP_FUNCTION(hw_new_document_from_file)
2840+
{
28392841
pval **arg1, **arg2;
28402842
int len, type;
28412843
char *ptr;
@@ -2854,7 +2856,7 @@ PHP_FUNCTION(hw_new_document_from_file) {
28542856
convert_to_string_ex(arg1);
28552857
convert_to_string_ex(arg2);
28562858

2857-
fp = php_fopen_wrapper((*arg2)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
2859+
fp = php_fopen_wrapper((*arg2)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
28582860
if (!fp && !socketd){
28592861
if (issock != BAD_URL) {
28602862
char *tmp = estrndup(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2));

‎ext/oci8/oci8.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2930,7 +2930,7 @@ PHP_FUNCTION(ocisavelobfile)
29302930

29312931
convert_to_string_ex(arg);
29322932

2933-
if (php_check_open_basedir((*arg)->value.str.val)) {
2933+
if (php_check_open_basedir((*arg)->value.str.val TSRMLS_CC)) {
29342934
RETURN_FALSE;
29352935
}
29362936

@@ -3050,7 +3050,7 @@ PHP_FUNCTION(ociwritelobtofile)
30503050
}
30513051

30523052
if (filename && *filename) {
3053-
if (php_check_open_basedir(filename)) {
3053+
if (php_check_open_basedir(filename TSRMLS_CC)) {
30543054
goto bail;
30553055
}
30563056

‎ext/pgsql/pgsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ PHP_FUNCTION(pg_trace)
14361436
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, z_pgsql_link, id, "PostgreSQL link", le_link, le_plink);
14371437
convert_to_string_ex(z_filename);
14381438

1439-
fp = php_fopen_wrapper(Z_STRVAL_PP(z_filename), mode, ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
1439+
fp = php_fopen_wrapper(Z_STRVAL_PP(z_filename), mode, ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
14401440

14411441
if (!fp) {
14421442
php_error(E_WARNING, "Unable to open %s for logging", Z_STRVAL_PP(z_filename));

‎ext/standard/basic_functions.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,15 +1552,15 @@ PHP_FUNCTION(error_log)
15521552
headers=Z_STRVAL_PP(emailhead);
15531553
}
15541554

1555-
if (_php_error_log(opt_err,message,opt,headers)==FAILURE) {
1555+
if (_php_error_log(opt_err, message, opt, headers TSRMLS_CC)==FAILURE) {
15561556
RETURN_FALSE;
15571557
}
15581558

15591559
RETURN_TRUE;
15601560
}
15611561
/* }}} */
15621562

1563-
PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers)
1563+
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC)
15641564
{
15651565
FILE *logfile;
15661566
int issock=0, socketd=0;;
@@ -1582,7 +1582,7 @@ PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers)
15821582
return FAILURE;
15831583
break;
15841584
case 3: /*save to a file*/
1585-
logfile=php_fopen_wrapper(opt,"a", (IGNORE_URL|ENFORCE_SAFE_MODE), &issock, &socketd, NULL);
1585+
logfile=php_fopen_wrapper(opt,"a", (IGNORE_URL|ENFORCE_SAFE_MODE), &issock, &socketd, NULL TSRMLS_CC);
15861586
if(!logfile) {
15871587
php_error(E_WARNING,"error_log: Unable to write to %s",opt);
15881588
return FAILURE;

‎ext/standard/basic_functions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ typedef unsigned int php_stat_len;
122122
typedef int php_stat_len;
123123
#endif
124124

125-
PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers);
125+
PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC);
126126

127127
#if SIZEOF_INT == 4
128128
/* Most 32-bit and 64-bit systems have 32-bit ints */

‎ext/standard/file.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ PHP_FUNCTION(get_meta_tags)
317317
}
318318
convert_to_string_ex(filename);
319319

320-
md.fp = php_fopen_wrapper((*filename)->value.str.val, "rb", use_include_path|ENFORCE_SAFE_MODE, &md.issock, &md.socketd, NULL);
320+
md.fp = php_fopen_wrapper((*filename)->value.str.val, "rb", use_include_path|ENFORCE_SAFE_MODE, &md.issock, &md.socketd, NULL TSRMLS_CC);
321321
if (!md.fp && !md.socketd) {
322322
if (md.issock != BAD_URL) {
323323
char *tmp = estrndup(Z_STRVAL_PP(filename), Z_STRLEN_PP(filename));
@@ -497,7 +497,7 @@ PHP_FUNCTION(file)
497497
}
498498
convert_to_string_ex(filename);
499499

500-
fp = php_fopen_wrapper((*filename)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
500+
fp = php_fopen_wrapper((*filename)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
501501
if (!fp && !socketd) {
502502
if (issock != BAD_URL) {
503503
char *tmp = estrndup(Z_STRVAL_PP(filename), Z_STRLEN_PP(filename));
@@ -667,7 +667,7 @@ PHP_NAMED_FUNCTION(php_if_fopen)
667667
* We need a better way of returning error messages from
668668
* php_fopen_wrapper().
669669
*/
670-
fp = php_fopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
670+
fp = php_fopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
671671
if (!fp && !socketd) {
672672
if (issock != BAD_URL) {
673673
char *tmp = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1));
@@ -1629,7 +1629,7 @@ PHP_FUNCTION(readfile)
16291629
* We need a better way of returning error messages from
16301630
* php_fopen_wrapper().
16311631
*/
1632-
fp = php_fopen_wrapper((*arg1)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
1632+
fp = php_fopen_wrapper((*arg1)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
16331633
if (!fp && !socketd){
16341634
if (issock != BAD_URL) {
16351635
char *tmp = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1));

‎ext/standard/ftp_fopen_wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static int php_get_ftp_result(int socketd)
7979

8080
/* {{{ php_fopen_url_wrap_ftp
8181
*/
82-
FILE *php_fopen_url_wrap_ftp(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
82+
FILE *php_fopen_url_wrap_ftp(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC)
8383
{
8484
FILE *fp=NULL;
8585
php_url *resource=NULL;

‎ext/standard/http_fopen_wrapper.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
/* {{{ php_fopen_url_wrap_http
7272
*/
73-
FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
73+
FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC)
7474
{
7575
FILE *fp=NULL;
7676
php_url *resource=NULL;
@@ -85,7 +85,6 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
8585
zval *response_header;
8686
char *http_header_line;
8787
int http_header_line_length, http_header_line_size;
88-
TSRMLS_FETCH();
8988

9089
resource = php_url_parse((char *) path);
9190
if (resource == NULL) {
@@ -276,7 +275,7 @@ FILE *php_fopen_url_wrap_http(char *path, char *mode, int options, int *issock,
276275
if (location[0] != '\0') {
277276
zval **response_header_new, *entry, **entryp;
278277

279-
fp = php_fopen_url_wrap_http(location, mode, options, issock, socketd, opened_path);
278+
fp = php_fopen_url_wrap_http(location, mode, options, issock, socketd, opened_path TSRMLS_CC);
280279
if (zend_hash_find(EG(active_symbol_table), "http_response_header", sizeof("http_response_header"), (void **) &response_header_new) == SUCCESS) {
281280
entryp = &entry;
282281
MAKE_STD_ZVAL(entry);

‎ext/standard/image.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ PHP_FUNCTION(getimagesize)
436436
break;
437437
}
438438

439-
fp = php_fopen_wrapper(Z_STRVAL_PP(arg1), "rb", IGNORE_PATH|ENFORCE_SAFE_MODE, &issock, &socketd, NULL);
439+
fp = php_fopen_wrapper(Z_STRVAL_PP(arg1), "rb", IGNORE_PATH|ENFORCE_SAFE_MODE, &issock, &socketd, NULL TSRMLS_CC);
440440

441441
if (!fp && !socketd) {
442442
if (issock != BAD_URL) {

‎ext/standard/php_fopen_wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
/* {{{ php_fopen_url_wrap_php
3535
*/
36-
FILE *php_fopen_url_wrap_php(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
36+
FILE *php_fopen_url_wrap_php(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC)
3737
{
3838
const char *res = path + 6;
3939

‎ext/standard/php_fopen_wrappers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#ifndef PHP_FOPEN_WRAPPERS_H
2424
#define PHP_FOPEN_WRAPPERS_H
2525

26-
extern FILE *php_fopen_url_wrap_http(char *, char *, int, int *, int *, char **);
27-
extern FILE *php_fopen_url_wrap_ftp(char *, char *, int, int *, int *, char **);
28-
extern FILE *php_fopen_url_wrap_php(char *, char *, int, int *, int *, char **);
26+
FILE *php_fopen_url_wrap_http(char *, char *, int, int *, int *, char ** TSRMLS_DC);
27+
FILE *php_fopen_url_wrap_ftp(char *, char *, int, int *, int *, char ** TSRMLS_DC);
28+
FILE *php_fopen_url_wrap_php(char *, char *, int, int *, int *, char ** TSRMLS_DC);
2929

3030
#endif

‎ext/standard/url_scanner_ex.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,12 +887,9 @@ PHP_RSHUTDOWN_FUNCTION(url_scanner)
887887
PHP_MINIT_FUNCTION(url_scanner)
888888
{
889889
url_adapt_state_ex_t *ctx;
890-
//TSRMLS_FETCH();
891890

892891
ctx = &BG(url_adapt_state_ex);
893-
894-
ctx->tags = NULL;
895-
892+
ctx->tags = NULL;
896893
REGISTER_INI_ENTRIES();
897894
return SUCCESS;
898895
}

‎ext/zlib/php_zlib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ PHP_FUNCTION(gzinflate);
6464
PHP_FUNCTION(gzencode);
6565
PHP_FUNCTION(ob_gzhandler);
6666

67-
FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path);
67+
FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC);
6868
int php_enable_output_compression(int buffer_size);
6969

7070

‎ext/zlib/zlib.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ PHP_MINIT_FUNCTION(zlib)
165165
#if HAVE_FOPENCOOKIE
166166

167167
if(PG(allow_url_fopen)) {
168-
php_register_url_wrapper("zlib",zlib_fopen_wrapper TSRMLS_CC);
168+
php_register_url_wrapper("zlib", zlib_fopen_wrapper TSRMLS_CC);
169169
}
170170
#endif
171171

@@ -229,12 +229,12 @@ PHP_MINFO_FUNCTION(zlib)
229229

230230
/* {{{ php_gzopen_wrapper
231231
*/
232-
static gzFile php_gzopen_wrapper(char *path, char *mode, int options)
232+
static gzFile php_gzopen_wrapper(char *path, char *mode, int options TSRMLS_DC)
233233
{
234234
FILE *f;
235235
int issock=0, socketd=0;
236236

237-
f = php_fopen_wrapper(path, mode, options, &issock, &socketd, NULL);
237+
f = php_fopen_wrapper(path, mode, options, &issock, &socketd, NULL TSRMLS_CC);
238238

239239
if (!f) {
240240
return NULL;
@@ -272,7 +272,7 @@ PHP_FUNCTION(gzfile)
272272
}
273273
convert_to_string_ex(filename);
274274

275-
zp = php_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE);
275+
zp = php_gzopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC);
276276
if (!zp) {
277277
php_error(E_WARNING,"gzFile(\"%s\") - %s",(*filename)->value.str.val,strerror(errno));
278278
RETURN_FALSE;
@@ -332,7 +332,7 @@ PHP_FUNCTION(gzopen)
332332
* We need a better way of returning error messages from
333333
* php_gzopen_wrapper().
334334
*/
335-
zp = php_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE);
335+
zp = php_gzopen_wrapper((*arg1)->value.str.val, p, use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC);
336336
if (!zp) {
337337
php_error(E_WARNING,"gzopen(\"%s\",\"%s\") - %s",
338338
(*arg1)->value.str.val, p, strerror(errno));
@@ -640,7 +640,7 @@ PHP_FUNCTION(readgzfile)
640640
* We need a better way of returning error messages from
641641
* php_gzopen_wrapper().
642642
*/
643-
zp = php_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE);
643+
zp = php_gzopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE TSRMLS_CC);
644644
if (!zp){
645645
php_error(E_WARNING,"ReadGzFile(\"%s\") - %s",(*arg1)->value.str.val,strerror(errno));
646646
RETURN_FALSE;

‎ext/zlib/zlib_fopen_wrapper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static COOKIE_IO_FUNCTIONS_T gz_cookie_functions =
5959
, gz_closer
6060
};
6161

62-
FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path)
62+
FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC)
6363
{
6464
struct gz_cookie *gc = NULL;
6565
FILE *fp;
@@ -75,7 +75,7 @@ FILE *zlib_fopen_wrapper(char *path, char *mode, int options, int *issock, int *
7575

7676
path++;
7777

78-
fp = php_fopen_wrapper(path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL);
78+
fp = php_fopen_wrapper(path, mode, options|IGNORE_URL, &fissock, &fsocketd, NULL TSRMLS_CC);
7979

8080
if (!fp) {
8181
free(gc);

0 commit comments

Comments
 (0)