Skip to content

Commit bc415d5

Browse files
zsuraskizsuraski
committed
* Finalizing the PHP version of SAPI. Support POST and cookies among other things.
* Fully implement ISAPI support - POST and cookies among other things. * Almost completely rewrote phpinfo(). Allow modules to easily display their information in phpinfo() without modifying phpinfo() itself (prototype for the module info function was changed, thus the large amount of updated module files). * Initial extended SAPI support for Apache, completely untested. * CGI now uses SAPI fully as well.
1 parent 91cf2e5 commit bc415d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+540
-344
lines changed

‎cgi_main.c

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,29 @@ static void sapi_cgi_send_header(sapi_header_struct *sapi_header, void *server_c
8585
}
8686

8787

88+
static char *sapi_cgi_read_post(SLS_D)
89+
{
90+
uint read_bytes=0, tmp_read_bytes;
91+
char *result = (char *) emalloc(SG(request_info).content_length+1);
92+
93+
while (read_bytes < SG(request_info).content_length) {
94+
tmp_read_bytes = read(0, result+read_bytes, SG(request_info).content_length-read_bytes);
95+
if (tmp_read_bytes<=0) {
96+
break;
97+
}
98+
read_bytes += tmp_read_bytes;
99+
}
100+
result[read_bytes]=0;
101+
return result;
102+
}
103+
104+
105+
static char *sapi_cgi_read_cookies(SLS_D)
106+
{
107+
return getenv("HTTP_COOKIE");
108+
}
109+
110+
88111
static sapi_module_struct sapi_module = {
89112
"PHP Language", /* name */
90113

@@ -98,6 +121,9 @@ static sapi_module_struct sapi_module = {
98121
NULL, /* header handler */
99122
NULL, /* send headers handler */
100123
sapi_cgi_send_header, /* send header handler */
124+
125+
sapi_cgi_read_post, /* read POST data */
126+
sapi_cgi_read_cookies /* read Cookies */
101127
};
102128

103129

@@ -132,15 +158,19 @@ static void php_cgi_usage(char *argv0)
132158

133159
static void init_request_info(SLS_D)
134160
{
135-
char *request_method = getenv("REQUEST_METHOD");
161+
char *content_length = getenv("CONTENT_LENGTH");
136162

163+
SG(request_info).request_method = getenv("REQUEST_METHOD");
137164
SG(request_info).query_string = getenv("QUERY_STRING");
138165
SG(request_info).request_uri = getenv("PATH_INFO");
139-
if (request_method && !strcmp(request_method, "HEAD")) {
166+
SG(request_info).path_translated = NULL; /* we have to update it later, when we have that information */
167+
if (SG(request_info).request_method && !strcmp(SG(request_info).request_method, "HEAD")) {
140168
SG(request_info).headers_only = 1;
141169
} else {
142170
SG(request_info).headers_only = 0;
143171
}
172+
SG(request_info).content_type = getenv("CONTENT_TYPE");
173+
SG(request_info).content_length = (content_length?atoi(content_length):0);
144174
}
145175

146176

@@ -229,6 +259,8 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
229259
sapi_globals = ts_resource(sapi_globals_id);
230260
#endif
231261

262+
init_request_info(SLS_C);
263+
SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
232264
CG(extended_info) = 0;
233265

234266
if (!cgi) { /* never execute the arguments if you are a CGI */
@@ -322,7 +354,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
322354

323355
php3_TreatHeaders();
324356

325-
init_request_info(SLS_C);
326357

327358
if (!cgi) {
328359
if (!SG(request_info).query_string) {

‎ext/apache/apache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extern module *top_module;
5454
void php3_virtual(INTERNAL_FUNCTION_PARAMETERS);
5555
void php3_getallheaders(INTERNAL_FUNCTION_PARAMETERS);
5656
void php3_apachelog(INTERNAL_FUNCTION_PARAMETERS);
57-
void php3_info_apache(void);
57+
void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS);
5858
void php3_apache_note(INTERNAL_FUNCTION_PARAMETERS);
5959
void php3_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS);
6060

@@ -154,7 +154,7 @@ void php3_apache_note(INTERNAL_FUNCTION_PARAMETERS)
154154
}
155155
/* }}} */
156156

157-
void php3_info_apache(void) {
157+
void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS) {
158158
module *modp = NULL;
159159
#if !defined(WIN32) && !defined(WINNT)
160160
char name[64];

‎ext/dav/dav.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int php3_minit_phpdav(INIT_FUNC_ARGS);
9191
int php3_rinit_phpdav(INIT_FUNC_ARGS);
9292
int php3_mshutdown_phpdav(SHUTDOWN_FUNC_ARGS);
9393
int php3_rshutdown_phpdav(SHUTDOWN_FUNC_ARGS);
94-
void php3_info_phpdav(void);
94+
void php3_info_phpdav(ZEND_MODULE_INFO_FUNC_ARGS);
9595

9696
/* }}} */
9797
/* {{{ extension definition structures */
@@ -186,7 +186,7 @@ int php3_rshutdown_phpdav(SHUTDOWN_FUNC_ARGS)
186186
/* }}} */
187187
/* {{{ php3_info_phpdav() */
188188

189-
void php3_info_phpdav()
189+
void php3_info_phpdav(ZEND_MODULE_INFO_FUNC_ARGS)
190190
{
191191
}
192192

‎ext/db/db.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ static char *php3_get_info_db(void)
251251
}
252252

253253

254-
void php3_info_db(void)
254+
void php3_info_db(ZEND_MODULE_INFO_FUNC_ARGS)
255255
{
256256
php3_printf(php3_get_info_db());
257257
}

‎ext/db/php3_db.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ char *_php3_dbmnextkey(dbm_info *info, char *key);
7676
/* db file functions */
7777
extern int php3_minit_db(INIT_FUNC_ARGS);
7878
extern int php3_rinit_db(INIT_FUNC_ARGS);
79-
extern void php3_info_db(void);
79+
extern void php3_info_db(ZEND_MODULE_INFO_FUNC_ARGS);
8080
extern void php3_dblist(INTERNAL_FUNCTION_PARAMETERS);
8181
extern void php3_dbmopen(INTERNAL_FUNCTION_PARAMETERS);
8282
extern void php3_dbmclose(INTERNAL_FUNCTION_PARAMETERS);

‎ext/fdf/fdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int php3_minit_fdf(INIT_FUNC_ARGS)
109109
return SUCCESS;
110110
}
111111

112-
void php3_info_fdf(void) {
112+
void php3_info_fdf(ZEND_MODULE_INFO_FUNC_ARGS) {
113113
/* need to use a PHPAPI function here because it is external module in windows */
114114
php3_printf("FdfTk Version %s", FDFGetVersion());
115115
}

‎ext/fdf/php3_fdf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern php3_module_entry fdf_module_entry;
4444

4545
extern int php3_minit_fdf(INIT_FUNC_ARGS);
4646
extern int php3_mend_fdf(void);
47-
extern void php3_info_fdf(void);
47+
extern void php3_info_fdf(ZEND_MODULE_INFO_FUNC_ARGS);
4848
extern void php3_fdf_open(INTERNAL_FUNCTION_PARAMETERS);
4949
extern void php3_fdf_close(INTERNAL_FUNCTION_PARAMETERS);
5050
extern void php3_fdf_create(INTERNAL_FUNCTION_PARAMETERS);

‎ext/gd/gd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int php3_minit_gd(INIT_FUNC_ARGS)
178178
return SUCCESS;
179179
}
180180

181-
void php3_info_gd(void) {
181+
void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) {
182182
/* need to use a PHPAPI function here because it is external module in windows */
183183
#if HAVE_LIBGD13
184184
php3_printf("Version 1.3");

‎ext/gettext/gettext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ php3_module_entry php3_gettext_module_entry = {
5252
"gettext", php3_gettext_functions, NULL, NULL, NULL, NULL, php3_info_gettext, STANDARD_MODULE_PROPERTIES
5353
};
5454

55-
void php3_info_gettext(void)
55+
void php3_info_gettext(ZEND_MODULE_INFO_FUNC_ARGS)
5656
{
5757
php3_printf("GNU gettext support active.");
5858
}

‎ext/gettext/php3_gettext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
extern php3_module_entry php3_gettext_module_entry;
4141
#define php3_gettext_module_ptr &php3_gettext_module_entry
4242

43-
extern void php3_info_gettext(void);
43+
extern void php3_info_gettext(ZEND_MODULE_INFO_FUNC_ARGS);
4444
extern void php3_textdomain(INTERNAL_FUNCTION_PARAMETERS);
4545
extern void php3_gettext(INTERNAL_FUNCTION_PARAMETERS);
4646
extern void php3_dgettext(INTERNAL_FUNCTION_PARAMETERS);

‎ext/hyperwave/hw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ void php3_hw_getcgi(INTERNAL_FUNCTION_PARAMETERS) {
15311531
getenv("QUERY_STRING"));
15321532
#else
15331533
sprintf(cgi_env_str, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s",
1534-
request_info.request_method,
1534+
SG(request_info).request_method,
15351535
SG(request_info).request_uri,
15361536
SG(request_info).query_string);
15371537
#endif
@@ -1783,7 +1783,7 @@ void php3_hw_pipecgi(INTERNAL_FUNCTION_PARAMETERS) {
17831783
getenv("QUERY_STRING"));
17841784
#else
17851785
sprintf(cgi_env_str, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s",
1786-
request_info.request_method,
1786+
SG(request_info).request_method,
17871787
SG(request_info).request_uri,
17881788
SG(request_info).query_string);
17891789
#endif
@@ -2959,7 +2959,7 @@ void php3_hw_getrellink(INTERNAL_FUNCTION_PARAMETERS) {
29592959
/* }}} */
29602960

29612961

2962-
void php3_info_hw()
2962+
void php3_info_hw(ZEND_MODULE_INFO_FUNC_ARGS)
29632963
{
29642964
php3_printf("HG-CSP Version: 7.17");
29652965
}

‎ext/hyperwave/hw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ extern void php3_hw_document_content(INTERNAL_FUNCTION_PARAMETERS);
109109
extern void php3_hw_objrec2array(INTERNAL_FUNCTION_PARAMETERS);
110110
extern void php3_hw_array2objrec(INTERNAL_FUNCTION_PARAMETERS);
111111
extern void php3_hw_connection_info(INTERNAL_FUNCTION_PARAMETERS);
112-
extern void php3_info_hw(void);
112+
extern void php3_info_hw(ZEND_MODULE_INFO_FUNC_ARGS);
113113
extern void php3_hw_getsrcbydestobj(INTERNAL_FUNCTION_PARAMETERS);
114114
extern void php3_hw_getrellink(INTERNAL_FUNCTION_PARAMETERS);
115115
extern void php3_hw_dummy(INTERNAL_FUNCTION_PARAMETERS);

‎ext/informix/php3_ifx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern php3_module_entry ifx_module_entry;
5656
extern int php3_minit_ifx(INIT_FUNC_ARGS);
5757
extern int php3_rinit_ifx(INIT_FUNC_ARGS);
5858
extern int php3_mshutdown_ifx(SHUTDOWN_FUNC_ARGS);
59-
extern void php3_info_ifx(void);
59+
extern void php3_info_ifx(ZEND_MODULE_INFO_FUNC_ARGS);
6060
extern void php3_ifx_connect(INTERNAL_FUNCTION_PARAMETERS);
6161
extern void php3_ifx_pconnect(INTERNAL_FUNCTION_PARAMETERS);
6262
extern void php3_ifx_close(INTERNAL_FUNCTION_PARAMETERS);

‎ext/interbase/interbase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ int php3_rfinish_ibase(void)
214214
}
215215
*/
216216

217-
void php3_info_ibase(void)
217+
void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS)
218218
{
219219
/* TODO */
220220
}

‎ext/interbase/php3_interbase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern php3_module_entry ibase_module_entry;
4747
extern int php3_minit_ibase(INIT_FUNC_ARGS);
4848
extern int php3_rinit_ibase(INIT_FUNC_ARGS);
4949
extern int php3_mfinish_ibase(void);
50-
extern void php3_info_ibase(void);
50+
extern void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS);
5151
extern void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS);
5252
extern void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS);
5353
extern void php3_ibase_close(INTERNAL_FUNCTION_PARAMETERS);

‎ext/ldap/ldap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) {
260260
return SUCCESS;
261261
}
262262

263-
void php3_info_ldap(void)
263+
void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS)
264264
{
265265
char maxl[16];
266266
#if HAVE_NSLDAP

‎ext/ldap/php3_ldap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extern php3_module_entry ldap_module_entry;
5050
extern int php3_minit_ldap(INIT_FUNC_ARGS);
5151
extern int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS);
5252

53-
extern void php3_info_ldap(void);
53+
extern void php3_info_ldap(ZEND_MODULE_INFO_FUNC_ARGS);
5454

5555
extern void php3_ldap_connect(INTERNAL_FUNCTION_PARAMETERS);
5656

‎ext/msql/msql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ DLEXPORT int php3_rinit_msql(INIT_FUNC_ARGS)
275275
return SUCCESS;
276276
}
277277

278-
DLEXPORT void php3_info_msql(void)
278+
DLEXPORT void php3_info_msql(ZEND_MODULE_INFO_FUNC_ARGS)
279279
{
280280
char maxp[16],maxl[16];
281281
MSQL_TLS_VARS;

‎ext/msql/php3_msql.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern php3_module_entry msql_module_entry;
4848
extern DLEXPORT int php3_minit_msql(INIT_FUNC_ARGS);
4949
extern DLEXPORT int php3_rinit_msql(INIT_FUNC_ARGS);
5050
extern DLEXPORT int php3_mshutdown_msql(SHUTDOWN_FUNC_ARGS);
51-
extern DLEXPORT void php3_info_msql(void);
51+
extern DLEXPORT void php3_info_msql(ZEND_MODULE_INFO_FUNC_ARGS);
5252
extern DLEXPORT void php3_msql_connect(INTERNAL_FUNCTION_PARAMETERS);
5353
extern DLEXPORT void php3_msql_pconnect(INTERNAL_FUNCTION_PARAMETERS);
5454
extern DLEXPORT void php3_msql_close(INTERNAL_FUNCTION_PARAMETERS);

‎ext/mysql/mysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ int php3_rinit_mysql(INIT_FUNC_ARGS)
309309
}
310310

311311

312-
void php3_info_mysql(void)
312+
void php3_info_mysql(ZEND_MODULE_INFO_FUNC_ARGS)
313313
{
314314
char maxp[16],maxl[16];
315315
MySLS_FETCH();

‎ext/mysql/php3_mysql.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extern php3_module_entry mysql_module_entry;
4949
extern int php3_minit_mysql(INIT_FUNC_ARGS);
5050
extern int php3_rinit_mysql(INIT_FUNC_ARGS);
5151
extern int php3_mshutdown_mysql(SHUTDOWN_FUNC_ARGS);
52-
extern void php3_info_mysql(void);
52+
extern void php3_info_mysql(ZEND_MODULE_INFO_FUNC_ARGS);
5353
extern void php3_mysql_connect(INTERNAL_FUNCTION_PARAMETERS);
5454
extern void php3_mysql_pconnect(INTERNAL_FUNCTION_PARAMETERS);
5555
extern void php3_mysql_close(INTERNAL_FUNCTION_PARAMETERS);

‎ext/odbc/odbc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ int php3_mshutdown_odbc(SHUTDOWN_FUNC_ARGS)
287287
}
288288

289289

290-
void php3_info_odbc(void)
290+
void php3_info_odbc(ZEND_MODULE_INFO_FUNC_ARGS)
291291
{
292292
ODBC_TLS_VARS;
293293

‎ext/odbc/php3_odbc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ extern php3_module_entry odbc_module_entry;
120120
extern int php3_minit_odbc(INIT_FUNC_ARGS);
121121
extern int php3_mshutdown_odbc(SHUTDOWN_FUNC_ARGS);
122122
extern int php3_rinit_odbc(INIT_FUNC_ARGS);
123-
extern void php3_info_odbc(void);
123+
extern void php3_info_odbc(ZEND_MODULE_INFO_FUNC_ARGS);
124124
extern PHP_FUNCTION(odbc_setoption);
125125
extern PHP_FUNCTION(odbc_autocommit);
126126
extern PHP_FUNCTION(odbc_close);

‎ext/odbc/php3_velocis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ extern php3_module_entry velocis_module_entry;
7676
/* velocis.c functions */
7777
extern int php3_minit_velocis(INIT_FUNC_ARGS);
7878
extern int php3_rinit_velocis(INIT_FUNC_ARGS);
79-
extern void php3_info_velocis(void);
80-
extern int php3_shutdown_velocis(void);
79+
extern void php3_info_velocis(ZEND_MODULE_INFO_FUNC_ARGS);
80+
extern int php3_shutdown_velocis(SHUTDOWN_FUNC_ARGS);
8181
extern void php3_velocis_connect(INTERNAL_FUNCTION_PARAMETERS);
8282
extern void php3_velocis_close(INTERNAL_FUNCTION_PARAMETERS);
8383
extern void php3_velocis_exec(INTERNAL_FUNCTION_PARAMETERS);

‎ext/odbc/velocis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int php3_rinit_velocis(INIT_FUNC_ARGS)
111111
}
112112

113113

114-
void php3_info_velocis(void)
114+
void php3_info_velocis(ZEND_MODULE_INFO_FUNC_ARGS)
115115
{
116116
php3_printf("RAIMA Velocis Support Active");
117117
}

‎ext/oracle/oci8.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ int php3_minit_oci8(INIT_FUNC_ARGS);
162162
int php3_rinit_oci8(INIT_FUNC_ARGS);
163163
int php3_mshutdown_oci8(SHUTDOWN_FUNC_ARGS);
164164
int php3_rshutdown_oci8(SHUTDOWN_FUNC_ARGS);
165-
void php3_info_oci8(void);
165+
void php3_info_oci8(ZEND_MODULE_INFO_FUNC_ARGS);
166166

167167
static ub4 oci8_error(OCIError *err_p, char *what, sword status);
168168
/* static int oci8_ping(oci8_connection *conn); XXX NYI */
@@ -536,7 +536,7 @@ int php3_rshutdown_oci8(SHUTDOWN_FUNC_ARGS)
536536
}
537537

538538

539-
void php3_info_oci8()
539+
void php3_info_oci8(ZEND_MODULE_INFO_FUNC_ARGS)
540540
{
541541
#if !(WIN32|WINNT)
542542
php3_printf("Oracle version: %s<br>\n"

‎ext/oracle/oracle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ void php3_Ora_ErrorCode(INTERNAL_FUNCTION_PARAMETERS)
15641564
}
15651565
/* }}} */
15661566

1567-
void php3_info_oracle()
1567+
void php3_info_oracle(ZEND_MODULE_INFO_FUNC_ARGS)
15681568
{
15691569
#if !(WIN32|WINNT)
15701570
php3_printf("Oracle version: %s<br>\n"

‎ext/oracle/oracle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ extern void php3_Ora_Rollback(INTERNAL_FUNCTION_PARAMETERS);
136136
extern int php3_minit_oracle(INIT_FUNC_ARGS);
137137
extern int php3_mshutdown_oracle(SHUTDOWN_FUNC_ARGS);
138138
extern int php3_rshutdown_oracle(SHUTDOWN_FUNC_ARGS);
139-
extern void php3_info_oracle(void);
139+
extern void php3_info_oracle(ZEND_MODULE_INFO_FUNC_ARGS);
140140
extern int php3_rinit_oracle(INIT_FUNC_ARGS);
141141

142142
#else

‎ext/pdf/pdf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ int php3_minit_pdf(INIT_FUNC_ARGS)
161161
return SUCCESS;
162162
}
163163

164-
void php3_info_pdf(void) {
164+
void php3_info_pdf(ZEND_MODULE_INFO_FUNC_ARGS) {
165165
/* need to use a PHPAPI function here because it is external module in windows */
166166
php3_printf("%s. AFM files in %s", PDFLIB_VERSION, PDF_DEFAULT_FONT_PATH);
167167
}

‎ext/pdf/php3_pdf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extern int le_fp;
4040
extern php3_module_entry pdf_module_entry;
4141
#define pdf_module_ptr &pdf_module_entry
4242

43-
extern void php3_info_pdf(void);
43+
extern void php3_info_pdf(ZEND_MODULE_INFO_FUNC_ARGS);
4444
extern int php3_minit_pdf(INIT_FUNC_ARGS);
4545
extern int php3_mend_pdf(void);
4646
extern void php3_pdf_get_info(INTERNAL_FUNCTION_PARAMETERS);

0 commit comments

Comments
 (0)