Hi, I know the SPU freeze is coming, but I'm going to try to get the new version on time. I intend to release a DSA to fix a couple of security issues on Friday or Saturday. As such, I'd like to avoid having to prepare two different versions (a SPU and later a DSA) and would like to include the SPU changes on the DSA. Attached are the non-sec patches. As discussed on IRC with Adam I am going to use +lenny5 for the SPU changes and +lenny6 for the DSA fixes, although +lenny5 is not going to be uploaded. Is there any objection? Cheers, -- Raphael Geissert - Debian Developer www.debian.org - get.debian.net
--- php.orig/ext/mssql/php_mssql.c
+++ php/ext/mssql/php_mssql.c
@@ -78,6 +78,38 @@ zend_function_entry mssql_functions[] =
PHP_FE(mssql_execute, NULL)
PHP_FE(mssql_free_statement, NULL)
PHP_FE(mssql_guid_string, NULL)
+#if !defined(PHP_WIN32) && !defined(HAVE_SYBASE_CT)
+ PHP_FALIAS(sybase_connect, mssql_connect, NULL)
+ PHP_FALIAS(sybase_pconnect, mssql_pconnect, NULL)
+ PHP_FALIAS(sybase_close, mssql_close, NULL)
+ PHP_FALIAS(sybase_select_db, mssql_select_db, NULL)
+ PHP_FALIAS(sybase_query, mssql_query, NULL)
+ PHP_FALIAS(sybase_fetch_batch, mssql_fetch_batch, NULL)
+ PHP_FALIAS(sybase_affected_rows, mssql_rows_affected, NULL)
+ PHP_FALIAS(sybase_free_result, mssql_free_result, NULL)
+ PHP_FALIAS(sybase_get_last_message, mssql_get_last_message, NULL)
+ PHP_FALIAS(sybase_num_rows, mssql_num_rows, NULL)
+ PHP_FALIAS(sybase_num_fields, mssql_num_fields, NULL)
+ PHP_FALIAS(sybase_fetch_field, mssql_fetch_field, NULL)
+ PHP_FALIAS(sybase_fetch_row, mssql_fetch_row, NULL)
+ PHP_FALIAS(sybase_fetch_array, mssql_fetch_array, NULL)
+ PHP_FALIAS(sybase_fetch_assoc, mssql_fetch_assoc, NULL)
+ PHP_FALIAS(sybase_fetch_object, mssql_fetch_object, NULL)
+ PHP_FALIAS(sybase_field_length, mssql_field_length, NULL)
+ PHP_FALIAS(sybase_field_name, mssql_field_name, NULL)
+ PHP_FALIAS(sybase_field_type, mssql_field_type, NULL)
+ PHP_FALIAS(sybase_data_seek, mssql_data_seek, NULL)
+ PHP_FALIAS(sybase_field_seek, mssql_field_seek, NULL)
+ PHP_FALIAS(sybase_result, mssql_result, NULL)
+ PHP_FALIAS(sybase_next_result, mssql_next_result, NULL)
+ PHP_FALIAS(sybase_min_error_severity, mssql_min_error_severity, NULL)
+ PHP_FALIAS(sybase_min_message_severity, mssql_min_message_severity, NULL)
+ PHP_FALIAS(sybase_init, mssql_init, NULL)
+ PHP_FALIAS(sybase_bind, mssql_bind, third_arg_force_ref)
+ PHP_FALIAS(sybase_execute, mssql_execute, NULL)
+ PHP_FALIAS(sybase_free_statement, mssql_free_statement, NULL)
+ PHP_FALIAS(sybase_guid_string, mssql_guid_string, NULL)
+#endif
{NULL, NULL, NULL}
};
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index ff702f2..56e7050 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -786,7 +786,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
{
php_curl *ch = (php_curl *) ctx;
php_curl_read *t = ch->handlers->read;
- int length = -1;
+ int length = 0;
switch (t->method) {
case PHP_CURL_DIRECT:
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 9ccbd7b..6d7908b 100644
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -230,8 +230,8 @@ typedef struct odbc_connection {
typedef struct odbc_result_value {
char name[32];
char *value;
- SDWORD vallen;
- SDWORD coltype;
+ SQLLEN vallen;
+ SQLLEN coltype;
} odbc_result_value;
typedef struct odbc_result {
--- a/ext/filter/logical_filters.c 2009/11/15 16:27:03 290790
+++ b/ext/filter/logical_filters.c 2009/11/15 16:53:40 290791
@@ -472,7 +472,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
+ const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\b]+\\\")|([A-Za-z0-9_][A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\=\\?\\^\\`\\|\\{\\}]*(\\.[A-Za-z0-9_\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\=\\?\\^\\`\\|\\{\\}]*)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9])(([A-Za-z0-9\\-])*([A-Za-z0-9]))?(\\.(?=[A-Za-z0-9\\-]))?)+[A-Za-z]+))$/D";
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
Attachment:
signature.asc
Description: This is a digitally signed message part.