]> granicus.if.org Git - php/commitdiff
- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for functi...
authorFelipe Pena <felipe@php.net>
Sat, 26 Jun 2010 16:03:39 +0000 (16:03 +0000)
committerFelipe Pena <felipe@php.net>
Sat, 26 Jun 2010 16:03:39 +0000 (16:03 +0000)
NEWS
ext/bz2/bz2.c
ext/interbase/interbase.c
ext/mysql/php_mysql.c
ext/openssl/openssl.c
ext/posix/posix.c
ext/standard/dir.c
ext/sybase_ct/php_sybase_ct.c
ext/zlib/zlib.c
sapi/litespeed/lsapi_main.c

diff --git a/NEWS b/NEWS
index 478f398a27d0a951bcece228b9f53042ea6b422c..f08b39d1b4efa053fda2855b76d26cec92559402 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2010, PHP 5.3.3 RC2
 - Implemented FR #51295 (SQLite3::busyTimeout not existing). (Mark)
 - Fixed the mail.log ini setting when no filename was given. (Johannes)
+- Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for
+  function aliases). (Felipe)
 - Fixed bug #52162 (custom request header variables with numbers are removed). 
   (Sriram Natarajan)
 - Fixed bug #52138 (Constants are parsed into the ini file for section names).
index e5feaff179564eabc134e44bc2db86df1ddc967a..f2805a15471db9682864069af904593f05a4f02f 100644 (file)
@@ -85,14 +85,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_bzdecompress, 0, 0, 1)
        ZEND_ARG_INFO(0, small)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_bzwrite, 0, 0, 2)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, str)
+       ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_bzflush, 0)
+       ZEND_ARG_INFO(0, fp)
+ZEND_END_ARG_INFO()
 /* }}} */
 
 static const zend_function_entry bz2_functions[] = {
        PHP_FE(bzopen,       arginfo_bzopen)
        PHP_FE(bzread,       arginfo_bzread)
-       PHP_FALIAS(bzwrite,   fwrite,           NULL)
-       PHP_FALIAS(bzflush,   fflush,           NULL)
-       PHP_FALIAS(bzclose,   fclose,           NULL)
+       PHP_FALIAS(bzwrite,   fwrite,           arginfo_bzwrite)
+       PHP_FALIAS(bzflush,   fflush,           arginfo_bzflush)
+       PHP_FALIAS(bzclose,   fclose,           arginfo_bzflush)
        PHP_FE(bzerrno,      arginfo_bzerrno)
        PHP_FE(bzerrstr,     arginfo_bzerrstr)
        PHP_FE(bzerror,      arginfo_bzerror)
index dedaf69c83b33f666f63a92d85db48ad24d44b71..aa1e602ebd7ddceedf114600b90e80ecf1a19b62 100644 (file)
@@ -385,62 +385,62 @@ const zend_function_entry ibase_functions[] = {
        * Firebird users should use the aliases, so future InterBase-specific changes will
        * not affect their code
        */
-       PHP_FALIAS(fbird_connect,ibase_connect, NULL)
-       PHP_FALIAS(fbird_pconnect,ibase_pconnect, NULL)
-       PHP_FALIAS(fbird_close,ibase_close, NULL)
-       PHP_FALIAS(fbird_drop_db,ibase_drop_db, NULL)
-       PHP_FALIAS(fbird_query,ibase_query, NULL)
-       PHP_FALIAS(fbird_fetch_row,ibase_fetch_row, NULL)
-       PHP_FALIAS(fbird_fetch_assoc,ibase_fetch_assoc, NULL)
-       PHP_FALIAS(fbird_fetch_object,ibase_fetch_object, NULL)
-       PHP_FALIAS(fbird_free_result,ibase_free_result, NULL)
-       PHP_FALIAS(fbird_name_result,ibase_name_result, NULL)
-       PHP_FALIAS(fbird_prepare,ibase_prepare, NULL)
-       PHP_FALIAS(fbird_execute,ibase_execute, NULL)
-       PHP_FALIAS(fbird_free_query,ibase_free_query, NULL)
-       PHP_FALIAS(fbird_gen_id,ibase_gen_id, NULL)
-       PHP_FALIAS(fbird_num_fields,ibase_num_fields, NULL)
-       PHP_FALIAS(fbird_num_params,ibase_num_params, NULL)
+       PHP_FALIAS(fbird_connect,               ibase_connect,          arginfo_ibase_connect)
+       PHP_FALIAS(fbird_pconnect,              ibase_pconnect,         arginfo_ibase_pconnect)
+       PHP_FALIAS(fbird_close,                 ibase_close,            arginfo_ibase_close)
+       PHP_FALIAS(fbird_drop_db,               ibase_drop_db,          arginfo_ibase_drop_db)
+       PHP_FALIAS(fbird_query,                 ibase_query,            arginfo_ibase_query)
+       PHP_FALIAS(fbird_fetch_row,             ibase_fetch_row,        arginfo_ibase_fetch_row)
+       PHP_FALIAS(fbird_fetch_assoc,   ibase_fetch_assoc,      arginfo_ibase_fetch_assoc)
+       PHP_FALIAS(fbird_fetch_object,  ibase_fetch_object, arginfo_ibase_fetch_object)
+       PHP_FALIAS(fbird_free_result,   ibase_free_result,      arginfo_ibase_free_result)
+       PHP_FALIAS(fbird_name_result,   ibase_name_result,      arginfo_ibase_name_result)
+       PHP_FALIAS(fbird_prepare,               ibase_prepare,          arginfo_ibase_prepare)
+       PHP_FALIAS(fbird_execute,               ibase_execute,          arginfo_ibase_execute)
+       PHP_FALIAS(fbird_free_query,    ibase_free_query,       arginfo_ibase_free_query)
+       PHP_FALIAS(fbird_gen_id,                ibase_gen_id,           arginfo_ibase_gen_id)
+       PHP_FALIAS(fbird_num_fields,    ibase_num_fields,       arginfo_ibase_num_fields)
+       PHP_FALIAS(fbird_num_params,    ibase_num_params,       arginfo_ibase_num_params)
 #if abies_0
-       PHP_FALIAS(fbird_num_rows,ibase_num_rows, NULL)
+       PHP_FALIAS(fbird_num_rows,              ibase_num_rows,         arginfo_ibase_num_rows)
 #endif
-       PHP_FALIAS(fbird_affected_rows,ibase_affected_rows, NULL)
-       PHP_FALIAS(fbird_field_info,ibase_field_info, NULL)
-       PHP_FALIAS(fbird_param_info,ibase_param_info, NULL)
-
-       PHP_FALIAS(fbird_trans,ibase_trans, NULL)
-       PHP_FALIAS(fbird_commit,ibase_commit, NULL)
-       PHP_FALIAS(fbird_rollback,ibase_rollback, NULL)
-       PHP_FALIAS(fbird_commit_ret,ibase_commit_ret, NULL)
-       PHP_FALIAS(fbird_rollback_ret,ibase_rollback_ret, NULL)
-
-       PHP_FALIAS(fbird_blob_info,ibase_blob_info, NULL)
-       PHP_FALIAS(fbird_blob_create,ibase_blob_create, NULL)
-       PHP_FALIAS(fbird_blob_add,ibase_blob_add, NULL)
-       PHP_FALIAS(fbird_blob_cancel,ibase_blob_cancel, NULL)
-       PHP_FALIAS(fbird_blob_close,ibase_blob_close, NULL)
-       PHP_FALIAS(fbird_blob_open,ibase_blob_open, NULL)
-       PHP_FALIAS(fbird_blob_get,ibase_blob_get, NULL)
-       PHP_FALIAS(fbird_blob_echo,ibase_blob_echo, NULL)
-       PHP_FALIAS(fbird_blob_import,ibase_blob_import, NULL)
-       PHP_FALIAS(fbird_errmsg,ibase_errmsg, NULL)
-       PHP_FALIAS(fbird_errcode,ibase_errcode, NULL)
-
-       PHP_FALIAS(fbird_add_user,ibase_add_user, NULL)
-       PHP_FALIAS(fbird_modify_user,ibase_modify_user, NULL)
-       PHP_FALIAS(fbird_delete_user,ibase_delete_user, NULL)
-
-       PHP_FALIAS(fbird_service_attach,ibase_service_attach, NULL)
-       PHP_FALIAS(fbird_service_detach,ibase_service_detach, NULL)
-       PHP_FALIAS(fbird_backup,ibase_backup, NULL)
-       PHP_FALIAS(fbird_restore,ibase_restore, NULL)
-       PHP_FALIAS(fbird_maintain_db,ibase_maintain_db, NULL)
-       PHP_FALIAS(fbird_db_info,ibase_db_info, NULL)
-       PHP_FALIAS(fbird_server_info,ibase_server_info, NULL)
-
-       PHP_FALIAS(fbird_wait_event,ibase_wait_event, NULL)
-       PHP_FALIAS(fbird_set_event_handler,ibase_set_event_handler, NULL)
-       PHP_FALIAS(fbird_free_event_handler,ibase_free_event_handler, NULL)
+       PHP_FALIAS(fbird_affected_rows, ibase_affected_rows, arginfo_ibase_affected_rows)
+       PHP_FALIAS(fbird_field_info,    ibase_field_info,       arginfo_ibase_field_info)
+       PHP_FALIAS(fbird_param_info,    ibase_param_info,       arginfo_ibase_param_info)
+
+       PHP_FALIAS(fbird_trans,                 ibase_trans,            arginfo_ibase_trans)
+       PHP_FALIAS(fbird_commit,                ibase_commit,           arginfo_ibase_commit)
+       PHP_FALIAS(fbird_rollback,              ibase_rollback,         arginfo_ibase_rollback)
+       PHP_FALIAS(fbird_commit_ret,    ibase_commit_ret,       arginfo_ibase_commit_ret)
+       PHP_FALIAS(fbird_rollback_ret,  ibase_rollback_ret, arginfo_ibase_rollback_ret)
+
+       PHP_FALIAS(fbird_blob_info,             ibase_blob_info,        arginfo_ibase_blob_info)
+       PHP_FALIAS(fbird_blob_create,   ibase_blob_create,      arginfo_ibase_blob_create)
+       PHP_FALIAS(fbird_blob_add,              ibase_blob_add,         arginfo_ibase_blob_add)
+       PHP_FALIAS(fbird_blob_cancel,   ibase_blob_cancel,      arginfo_ibase_blob_cancel)
+       PHP_FALIAS(fbird_blob_close,    ibase_blob_close,       arginfo_ibase_blob_close)
+       PHP_FALIAS(fbird_blob_open,             ibase_blob_open,        arginfo_ibase_blob_open)
+       PHP_FALIAS(fbird_blob_get,              ibase_blob_get,         arginfo_ibase_blob_get)
+       PHP_FALIAS(fbird_blob_echo,             ibase_blob_echo,        arginfo_ibase_blob_echo)
+       PHP_FALIAS(fbird_blob_import,   ibase_blob_import,      arginfo_ibase_blob_import)
+       PHP_FALIAS(fbird_errmsg,                ibase_errmsg,           arginfo_ibase_errmsg)
+       PHP_FALIAS(fbird_errcode,               ibase_errcode,          arginfo_ibase_errcode)
+
+       PHP_FALIAS(fbird_add_user,              ibase_add_user,         arginfo_ibase_add_user)
+       PHP_FALIAS(fbird_modify_user,   ibase_modify_user,      arginfo_ibase_modify_user)
+       PHP_FALIAS(fbird_delete_user,   ibase_delete_user,      arginfo_ibase_delete_user)
+
+       PHP_FALIAS(fbird_service_attach,        ibase_service_attach, arginfo_ibase_service_attach)
+       PHP_FALIAS(fbird_service_detach,        ibase_service_detach, arginfo_ibase_service_detach)
+       PHP_FALIAS(fbird_backup,                ibase_backup,           arginfo_ibase_backup)
+       PHP_FALIAS(fbird_restore,               ibase_restore,          arginfo_ibase_restore)
+       PHP_FALIAS(fbird_maintain_db,   ibase_maintain_db,      arginfo_ibase_maintain_db)
+       PHP_FALIAS(fbird_db_info,               ibase_db_info,          arginfo_ibase_db_info)
+       PHP_FALIAS(fbird_server_info,   ibase_server_info,      arginfo_ibase_server_info)
+
+       PHP_FALIAS(fbird_wait_event,    ibase_wait_event,       arginfo_ibase_wait_event)
+       PHP_FALIAS(fbird_set_event_handler,     ibase_set_event_handler,        arginfo_ibase_set_event_handler)
+       PHP_FALIAS(fbird_free_event_handler,    ibase_free_event_handler, arginfo_ibase_free_event_handler)
        {NULL, NULL, NULL}
 };
 
index d63fe13db171018e3338a5dbf2ee70cccda16615..9370aff6ed0bf3a89690dae7d48544adfee8235e 100644 (file)
@@ -297,29 +297,29 @@ static const zend_function_entry mysql_functions[] = {
        PHP_FE(mysql_set_charset,                                                       arginfo_mysql_set_charset)
 #endif  
        /* for downwards compatability */
-       PHP_FALIAS(mysql,                               mysql_db_query,         NULL)
-       PHP_FALIAS(mysql_fieldname,             mysql_field_name,       NULL)
-       PHP_FALIAS(mysql_fieldtable,    mysql_field_table,      NULL)
-       PHP_FALIAS(mysql_fieldlen,              mysql_field_len,        NULL)
-       PHP_FALIAS(mysql_fieldtype,             mysql_field_type,       NULL)
-       PHP_FALIAS(mysql_fieldflags,    mysql_field_flags,      NULL)
-       PHP_FALIAS(mysql_selectdb,              mysql_select_db,        NULL)
+       PHP_FALIAS(mysql,                               mysql_db_query,         arginfo_mysql_db_query)
+       PHP_FALIAS(mysql_fieldname,             mysql_field_name,       arginfo_mysql_field_name)
+       PHP_FALIAS(mysql_fieldtable,    mysql_field_table,      arginfo_mysql_field_seek)
+       PHP_FALIAS(mysql_fieldlen,              mysql_field_len,        arginfo_mysql_field_seek)
+       PHP_FALIAS(mysql_fieldtype,             mysql_field_type,       arginfo_mysql_field_seek)
+       PHP_FALIAS(mysql_fieldflags,    mysql_field_flags,      arginfo_mysql_field_seek)
+       PHP_FALIAS(mysql_selectdb,              mysql_select_db,        mysql_list_tables)
 #ifndef NETWARE                /* The below two functions not supported on NetWare */
 #if MYSQL_VERSION_ID < 40000
-       PHP_DEP_FALIAS(mysql_createdb,  mysql_create_db,        NULL)
-       PHP_DEP_FALIAS(mysql_dropdb,    mysql_drop_db,          NULL)
+       PHP_DEP_FALIAS(mysql_createdb,  mysql_create_db,        arginfo_mysql_select_db)
+       PHP_DEP_FALIAS(mysql_dropdb,    mysql_drop_db,          arginfo_mysql_select_db)
 #endif
 #endif /* NETWARE */
-       PHP_FALIAS(mysql_freeresult,    mysql_free_result,      NULL)
-       PHP_FALIAS(mysql_numfields,             mysql_num_fields,       NULL)
-       PHP_FALIAS(mysql_numrows,               mysql_num_rows,         NULL)
-       PHP_FALIAS(mysql_listdbs,               mysql_list_dbs,         NULL)
-       PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables,      NULL)
-       PHP_FALIAS(mysql_listfields,    mysql_list_fields,      NULL)
-       PHP_FALIAS(mysql_db_name,               mysql_result,           NULL)
-       PHP_FALIAS(mysql_dbname,                mysql_result,           NULL)
-       PHP_FALIAS(mysql_tablename,             mysql_result,           NULL)
-       PHP_FALIAS(mysql_table_name,    mysql_result,           NULL)
+       PHP_FALIAS(mysql_freeresult,    mysql_free_result,      arginfo__result_mysql_arg)
+       PHP_FALIAS(mysql_numfields,             mysql_num_fields,       arginfo__result_mysql_arg)
+       PHP_FALIAS(mysql_numrows,               mysql_num_rows,         arginfo__result_mysql_arg)
+       PHP_FALIAS(mysql_listdbs,               mysql_list_dbs,         arginfo__optional_mysql_link)
+       PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables,      arginfo_mysql_select_db)
+       PHP_FALIAS(mysql_listfields,    mysql_list_fields,      arginfo_mysql_list_fields)
+       PHP_FALIAS(mysql_db_name,               mysql_result,           arginfo_mysql_result)
+       PHP_FALIAS(mysql_dbname,                mysql_result,           arginfo_mysql_result)
+       PHP_FALIAS(mysql_tablename,             mysql_result,           arginfo_mysql_result)
+       PHP_FALIAS(mysql_table_name,    mysql_result,           arginfo_mysql_result)
        {NULL, NULL, NULL}
 };
 /* }}} */
index b1ef0a76c663f2150cbe4587ae6adb32612a73d5..8432b4140332cc31e10eb53123dbfd01be934087 100644 (file)
@@ -386,9 +386,9 @@ const zend_function_entry openssl_functions[] = {
        PHP_FE(openssl_pkey_get_public,         arginfo_openssl_pkey_get_public)
        PHP_FE(openssl_pkey_get_details,        arginfo_openssl_pkey_get_details)
 
-       PHP_FALIAS(openssl_free_key,            openssl_pkey_free,                      NULL)
-       PHP_FALIAS(openssl_get_privatekey,      openssl_pkey_get_private,       NULL)
-       PHP_FALIAS(openssl_get_publickey,       openssl_pkey_get_public,        NULL)
+       PHP_FALIAS(openssl_free_key,            openssl_pkey_free,                      arginfo_openssl_pkey_free)
+       PHP_FALIAS(openssl_get_privatekey,      openssl_pkey_get_private,       arginfo_openssl_pkey_get_private)
+       PHP_FALIAS(openssl_get_publickey,       openssl_pkey_get_public,        arginfo_openssl_pkey_get_public)
 
 /* x.509 cert funcs */
        PHP_FE(openssl_x509_read,                               arginfo_openssl_x509_read)
index 01f8d407fddf9d80b35e2c2d72b3db45cb47fc53..aeaae224b25571bf8f12c420a1cf62fe596a9cab 100644 (file)
@@ -295,7 +295,7 @@ const zend_function_entry posix_functions[] = {
 #endif
 
        PHP_FE(posix_get_last_error,                                    arginfo_posix_get_last_error)
-       PHP_FALIAS(posix_errno, posix_get_last_error,   NULL)
+       PHP_FALIAS(posix_errno, posix_get_last_error,   arginfo_posix_get_last_error)
        PHP_FE(posix_strerror,                                                  arginfo_posix_strerror)
 #ifdef HAVE_INITGROUPS
        PHP_FE(posix_initgroups,        arginfo_posix_initgroups)
index 25f6139487d2bb1df1b38900d6b91fb88a4f7fae..470d886dd44a5fbb4a9aca94eb72615c08a76966 100644 (file)
@@ -94,11 +94,17 @@ static zend_class_entry *dir_class_entry_ptr;
                if (!dirp) \
                        RETURN_FALSE; \
        } 
+       
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_dir, 0, 0, 0)
+       ZEND_ARG_INFO(0, dir_handle)
+ZEND_END_ARG_INFO()
+/* }}} */
 
 static const zend_function_entry php_dir_class_functions[] = {
-       PHP_FALIAS(close,       closedir,       NULL)
-       PHP_FALIAS(rewind,      rewinddir,      NULL)
-       PHP_NAMED_FE(read,  php_if_readdir, NULL)
+       PHP_FALIAS(close,       closedir,               arginfo_dir)
+       PHP_FALIAS(rewind,      rewinddir,              arginfo_dir)
+       PHP_NAMED_FE(read,  php_if_readdir, arginfo_dir)
        {NULL, NULL, NULL}
 };
 
index 3b11af25f9923820b56393f8095f14ed6cf1090a..0850dff7c8ea7631cf080137d890efb157a209fe 100644 (file)
@@ -180,31 +180,30 @@ const zend_function_entry sybase_functions[] = {
        PHP_FE(sybase_deadlock_retry_count, arginfo_sybase_deadlock_retry_count)
 
 #if !defined(PHP_WIN32) && !defined(HAVE_MSSQL)
-       PHP_FALIAS(mssql_connect, sybase_connect, NULL)
-       PHP_FALIAS(mssql_pconnect, sybase_pconnect, NULL)
-       PHP_FALIAS(mssql_close, sybase_close, NULL)
-       PHP_FALIAS(mssql_select_db, sybase_select_db, NULL)
-       PHP_FALIAS(mssql_query, sybase_query, NULL)
-       PHP_FALIAS(mssql_unbuffered_query, sybase_unbuffered_query, NULL)
-       PHP_FALIAS(mssql_free_result, sybase_free_result, NULL)
-       PHP_FALIAS(mssql_get_last_message, sybase_get_last_message, NULL)
-       PHP_FALIAS(mssql_num_rows, sybase_num_rows, NULL)
-       PHP_FALIAS(mssql_num_fields, sybase_num_fields, NULL)
-       PHP_FALIAS(mssql_fetch_row, sybase_fetch_row, NULL)
-       PHP_FALIAS(mssql_fetch_array, sybase_fetch_array, NULL)
-       PHP_FALIAS(mssql_fetch_assoc, sybase_fetch_assoc, NULL)
-       PHP_FALIAS(mssql_fetch_object, sybase_fetch_object, NULL)
-       PHP_FALIAS(mssql_data_seek, sybase_data_seek, NULL)
-       PHP_FALIAS(mssql_fetch_field, sybase_fetch_field, NULL)
-       PHP_FALIAS(mssql_field_seek, sybase_field_seek, NULL)
-       PHP_FALIAS(mssql_result, sybase_result, NULL)
-       PHP_FALIAS(mssql_affected_rows, sybase_affected_rows, NULL)
-       PHP_FALIAS(mssql_min_client_severity,   sybase_min_client_severity, NULL)
-       PHP_FALIAS(mssql_min_server_severity, sybase_min_server_severity, NULL)
-       PHP_FALIAS(mssql_set_message_handler, sybase_set_message_handler, NULL)
-       PHP_FALIAS(mssql_deadlock_retry_count, sybase_deadlock_retry_count, NULL)
+       PHP_FALIAS(mssql_connect,       sybase_connect,         arginfo_sybase_connect)
+       PHP_FALIAS(mssql_pconnect,      sybase_pconnect,        arginfo_sybase_pconnect)
+       PHP_FALIAS(mssql_close,         sybase_close,           arginfo_sybase_close)
+       PHP_FALIAS(mssql_select_db, sybase_select_db,   arginfo_sybase_select_db)
+       PHP_FALIAS(mssql_query,         sybase_query,           arginfo_sybase_query)
+       PHP_FALIAS(mssql_unbuffered_query,      sybase_unbuffered_query,        arginfo_sybase_unbuffered_query)
+       PHP_FALIAS(mssql_free_result,           sybase_free_result,             arginfo_sybase_free_result)
+       PHP_FALIAS(mssql_get_last_message,      sybase_get_last_message,        arginfo_sybase_get_last_message)
+       PHP_FALIAS(mssql_num_rows,              sybase_num_rows,                arginfo_sybase_num_rows)
+       PHP_FALIAS(mssql_num_fields,    sybase_num_fields,              arginfo_sybase_num_fields)
+       PHP_FALIAS(mssql_fetch_row,     sybase_fetch_row,               arginfo_sybase_fetch_row)
+       PHP_FALIAS(mssql_fetch_array,   sybase_fetch_array,     arginfo_sybase_fetch_array)
+       PHP_FALIAS(mssql_fetch_assoc,   sybase_fetch_assoc,     arginfo_sybase_fetch_assoc)
+       PHP_FALIAS(mssql_fetch_object,  sybase_fetch_object,    arginfo_sybase_fetch_object)
+       PHP_FALIAS(mssql_data_seek,     sybase_data_seek,               arginfo_sybase_data_seek)
+       PHP_FALIAS(mssql_fetch_field,   sybase_fetch_field,     arginfo_sybase_fetch_field)
+       PHP_FALIAS(mssql_field_seek,    sybase_field_seek,              arginfo_sybase_field_seek)
+       PHP_FALIAS(mssql_result,                sybase_result,                  arginfo_sybase_result)
+       PHP_FALIAS(mssql_affected_rows, sybase_affected_rows,   arginfo_sybase_affected_rows)
+       PHP_FALIAS(mssql_min_client_severity,   sybase_min_client_severity,     arginfo_sybase_min_client_severity)
+       PHP_FALIAS(mssql_min_server_severity,   sybase_min_server_severity,     arginfo_sybase_min_server_severity)
+       PHP_FALIAS(mssql_set_message_handler,   sybase_set_message_handler,     arginfo_sybase_set_message_handler)
+       PHP_FALIAS(mssql_deadlock_retry_count,  sybase_deadlock_retry_count,    arginfo_sybase_deadlock_retry_count)
 #endif
-
        {NULL, NULL, NULL}
 };
 
index 69c05bbb24c39b361ec51616e5583bb7c98b30d1..9ad2929c4ba2895ee0536a8a37e9b5f7a33938f1 100644 (file)
@@ -155,25 +155,57 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_gzhandler, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_gzputs, 0, 0, 2)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, str)
+       ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_gzpassthru, 0)
+       ZEND_ARG_INFO(0, fp)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_gzseek, 0, 0, 2)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, offset)
+       ZEND_ARG_INFO(0, whence)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_gzread, 0)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_gzgetss, 0, 0, 1)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, length)
+       ZEND_ARG_INFO(0, allowable_tags)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_gzgets, 0, 0, 1)
+       ZEND_ARG_INFO(0, fp)
+       ZEND_ARG_INFO(0, length)
+ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ php_zlib_functions[]
  */
 static const zend_function_entry php_zlib_functions[] = {
        PHP_FE(readgzfile,                                              arginfo_readgzfile)
-       PHP_FALIAS(gzrewind,    rewind,                 NULL)
-       PHP_FALIAS(gzclose,             fclose,                 NULL)
-       PHP_FALIAS(gzeof,               feof,                   NULL)
-       PHP_FALIAS(gzgetc,              fgetc,                  NULL)
-       PHP_FALIAS(gzgets,              fgets,                  NULL)
-       PHP_FALIAS(gzgetss,             fgetss,                 NULL)
-       PHP_FALIAS(gzread,              fread,                  NULL)
+       PHP_FALIAS(gzrewind,    rewind,                 arginfo_gzpassthru)
+       PHP_FALIAS(gzclose,             fclose,                 arginfo_gzpassthru)
+       PHP_FALIAS(gzeof,               feof,                   arginfo_gzpassthru)
+       PHP_FALIAS(gzgetc,              fgetc,                  arginfo_gzpassthru)
+       PHP_FALIAS(gzgets,              fgets,                  arginfo_gzgets)
+       PHP_FALIAS(gzgetss,             fgetss,                 arginfo_gzgetss)
+       PHP_FALIAS(gzread,              fread,                  arginfo_gzread)
        PHP_FE(gzopen,                                                  arginfo_gzopen)
-       PHP_FALIAS(gzpassthru,  fpassthru,              NULL)
-       PHP_FALIAS(gzseek,              fseek,                  NULL)
-       PHP_FALIAS(gztell,              ftell,                  NULL)
-       PHP_FALIAS(gzwrite,             fwrite,                 NULL)
-       PHP_FALIAS(gzputs,              fwrite,                 NULL)
+       PHP_FALIAS(gzpassthru,  fpassthru,              arginfo_gzpassthru)
+       PHP_FALIAS(gzseek,              fseek,                  arginfo_gzseek)
+       PHP_FALIAS(gztell,              ftell,                  arginfo_gzpassthru)
+       PHP_FALIAS(gzwrite,             fwrite,                 arginfo_gzputs)
+       PHP_FALIAS(gzputs,              fwrite,                 arginfo_gzputs)
        PHP_FE(gzfile,                                                  arginfo_gzfile)
        PHP_FE(gzcompress,                                              arginfo_gzcompress)
        PHP_FE(gzuncompress,                                    arginfo_gzuncompress)
index 967c9acc600f7d6a87d3cfa2edffa32f8d47b8e8..fa8248e5d6c432202002fc530447cc6af92e5b30 100644 (file)
@@ -787,7 +787,10 @@ int main( int argc, char * argv[] )
 
 /*   LiteSpeed PHP module starts here */
 
-
+/* {{{ arginfo */
+ZEND_BEGIN_ARG_INFO(arginfo_litespeed__void, 0)
+ZEND_END_ARG_INFO()
+/* }}} */
 
 PHP_FUNCTION(litespeed_request_headers);
 PHP_FUNCTION(litespeed_response_headers);
@@ -795,11 +798,11 @@ PHP_FUNCTION(litespeed_response_headers);
 PHP_MINFO_FUNCTION(litespeed);
 
 zend_function_entry litespeed_functions[] = {
-       PHP_FE(litespeed_request_headers, NULL)
-       PHP_FE(litespeed_response_headers, NULL)
-       PHP_FALIAS(getallheaders, litespeed_request_headers, NULL)
-       PHP_FALIAS(apache_request_headers, litespeed_request_headers, NULL)
-       PHP_FALIAS(apache_response_headers, litespeed_response_headers, NULL)
+       PHP_FE(litespeed_request_headers,       arginfo_litespeed__void)
+       PHP_FE(litespeed_response_headers,      arginfo_litespeed__void)
+       PHP_FALIAS(getallheaders,                       litespeed_request_headers,      arginfo_litespeed__void)
+       PHP_FALIAS(apache_request_headers,      litespeed_request_headers,      arginfo_litespeed__void)
+       PHP_FALIAS(apache_response_headers, litespeed_response_headers, arginfo_litespeed__void)
        {NULL, NULL, NULL}
 };