date:20100926

[PHP-CVS] svn: /php/php-src/trunk/ext/pdo_dblib/ dblib_stmt.c

2010-09-26 Thread Stanley Sufficool

ssufficool   Sun, 26 Sep 2010 20:16:25 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303771

Log:
Update getColumnMeta native types for SQL Server 2008

Changed paths:
U   php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c

Modified: php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c
===
--- php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c2010-09-26 16:20:11 UTC 
(rev 303770)
+++ php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c2010-09-26 20:16:25 UTC 
(rev 303771)
@@ -35,60 +35,47 @@

 /* {{{ pdo_dblib_get_field_name
  *
- * Taken from php_mssql_get_field_name
+ * Updated for MSSQL 2008 SR2 extended types
  *
  */
 static char *pdo_dblib_get_field_name(int type)
 {
switch (type) {
-   case SQLBINARY:
-   case SQLVARBINARY:
-   return blob;
-   break;
-   case SQLCHAR:
-   case SQLVARCHAR:
-   return char;
-   break;
-   case SQLTEXT:
-   return text;
-   break;
-   case SQLDATETIME:
-   case SQLDATETIM4:
-   case SQLDATETIMN:
-   return datetime;
-   break;
-   case SQLDECIMAL:
-   case SQLFLT4:
-   case SQLFLT8:
-   case SQLFLTN:
-   return real;
-   break;
-   case SQLINT1:
-   case SQLINT2:
-   case SQLINT4:
-   case SQLINTN:
-   return int;
-   break;
-   case SQLNUMERIC:
-   return numeric;
-   break;
-   case SQLMONEY:
-   case SQLMONEY4:
-   case SQLMONEYN:
-   return money;
-   break;
-   case SQLBIT:
-   return bit;
-   break;
-   case SQLIMAGE:
-   return image;
-   break;
-#ifdef SQLUNIQUE
-   case SQLUNIQUE:
-   return uniqueidentifier;
-   break;
-#endif
-   default:
+   case 34: return image;
+   case 35: return text;
+   case 36: return uniqueidentifier;
+   case 40: return date;
+   case 41: return time;
+   case 42: return datetime2;
+   case 43: return datetimeoffset;
+   case 48: return tinyint;
+   case 52: return smallint;
+   case 56: return int;
+   case 58: return smalldatetime;
+   case 59: return real;
+   case 60: return money;
+   case 61: return datetime;
+   case 62: return float;
+   case 98: return sql_variant;
+   case 99: return ntext;
+   case 104: return bit;
+   case 106: return decimal;
+   case 108: return numeric;
+   case 122: return smallmoney;
+   case 127: return bigint;
+   //case 240: return hierarchyid;
+   case 240: return geometry;
+   //case 240: return geography;
+   case 165: return varbinary;
+   case 167: return varchar;
+   case 173: return binary;
+   case 175: return char;
+   case 189: return timestamp;
+   //case 231: return sysname;
+   case 231: return nvarchar;
+   case 239: return nchar;
+   case 241: return xml;
+   default:
return unknown;
break;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c trunk/ext/zlib/zlib_fopen_wrapper.c

2010-09-26 Thread Pierre Joye

pajoye   Sun, 26 Sep 2010 20:46:54 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303772

Log:
- fix bug #52926, zlib fopen wrapper does not use the context

Bug: http://bugs.php.net/52926 (Analyzed) stream_context_set_default() does not 
work as intended with stream chaining
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c
U   php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-09-26 20:16:25 UTC (rev 303771)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-09-26 20:46:54 UTC (rev 303772)
@@ -21,6 +21,7 @@
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)
 - Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)

+- Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo)
 - Fixed bug #52891 (Wrong data inserted with mysqli/mysqlnd when using
   mysqli_stmt_bind_param and value PHP_INT_MAX). (Andrey)
 - Fixed bug #52849 (GNU MP invalid version match). (Adam)

Modified: php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c  2010-09-26 
20:16:25 UTC (rev 303771)
+++ php/php-src/branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c  2010-09-26 
20:46:54 UTC (rev 303772)
@@ -128,7 +128,7 @@
path += 5;
}

-   innerstream = php_stream_open_wrapper(path, mode, STREAM_MUST_SEEK | 
options | STREAM_WILL_CAST, opened_path);
+   innerstream = php_stream_open_wrapper_ex(path, mode, STREAM_MUST_SEEK | 
options | STREAM_WILL_CAST, opened_path, context);

if (innerstream) {
int fd;

Modified: php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c
===
--- php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:16:25 UTC 
(rev 303771)
+++ php/php-src/trunk/ext/zlib/zlib_fopen_wrapper.c 2010-09-26 20:46:54 UTC 
(rev 303772)
@@ -128,7 +128,7 @@
path += 5;
}

-   innerstream = php_stream_open_wrapper(path, mode, STREAM_MUST_SEEK | 
options | STREAM_WILL_CAST, opened_path);
+   innerstream = php_stream_open_wrapper_ex(path, mode, STREAM_MUST_SEEK | 
options | STREAM_WILL_CAST, opened_path, context);

if (innerstream) {
int fd;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/trunk/ext/pdo_dblib/ dblib_stmt.c

2010-09-26 Thread Kalle Sommer Nielsen

Hi Stanley

2010/9/26 Stanley Sufficool ssuffic...@php.net:
 ssufficool                               Sun, 26 Sep 2010 20:16:25 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=303771

 Log:
 Update getColumnMeta native types for SQL Server 2008

 Changed paths:
    U   php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c

 Modified: php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c
 ===
 --- php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c        2010-09-26 16:20:11 
 UTC (rev 303770)
 +++ php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c        2010-09-26 20:16:25 
 UTC (rev 303771)
 @@ -35,60 +35,47 @@

  /* {{{ pdo_dblib_get_field_name
  *
 +               case 127: return bigint;
 +               //case 240: return hierarchyid;
 +               case 240: return geometry;
 +               //case 240: return geography;
 +               case 165: return varbinary;
 +               case 167: return varchar;
 +               case 173: return binary;
 +               case 175: return char;
 +               case 189: return timestamp;
 +               //case 231: return sysname;

Please use C multi line comments ( /* */ ) or #if 0 blocks for C90
compatiblity :)

-- 
regards,

Kalle Sommer Nielsen
ka...@php.net

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING.INTERNALS ext/date/php_date.c ext/date/php_date.h

2010-09-26 Thread Kalle Sommer Nielsen

kalleMon, 27 Sep 2010 01:19:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=303773

Log:
Removed a TSRMLS_FETCH() call in php_idate() in favor of the TSRMLS macros

Changed paths:
U   php/php-src/trunk/UPGRADING.INTERNALS
U   php/php-src/trunk/ext/date/php_date.c
U   php/php-src/trunk/ext/date/php_date.h

Modified: php/php-src/trunk/UPGRADING.INTERNALS
===
--- php/php-src/trunk/UPGRADING.INTERNALS   2010-09-26 20:46:54 UTC (rev 
303772)
+++ php/php-src/trunk/UPGRADING.INTERNALS   2010-09-27 01:19:57 UTC (rev 
303773)
@@ -99,4 +99,8 @@

 . php_get_current_user
   PHPAPI php_get_current_user(TSRMLS_D)
-  Call: char *user = php_get_current_user(TSRMLS_C);
\ No newline at end of file
+  Call: char *user = php_get_current_user(TSRMLS_C);
+
+. php_idate
+  PHPAPI php_idate(char format, time_t ts, int localtime TSRMLS_DC)
+  Call: int ret = php_idate(format, ts, localtime TSRMLS_CC)
\ No newline at end of file

Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c   2010-09-26 20:46:54 UTC (rev 
303772)
+++ php/php-src/trunk/ext/date/php_date.c   2010-09-27 01:19:57 UTC (rev 
303773)
@@ -1203,7 +1203,7 @@

 /* {{{ php_idate
  */
-PHPAPI int php_idate(char format, time_t ts, int localtime)
+PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC)
 {
timelib_time   *t;
timelib_tzinfo *tzi;
@@ -1214,7 +1214,6 @@
t = timelib_time_ctor();

if (!localtime) {
-   TSRMLS_FETCH();
tzi = get_timezone_info(TSRMLS_C);
t-tz_info = tzi;
t-zone_type = TIMELIB_ZONETYPE_ID;
@@ -1336,7 +1335,7 @@
ts = time(NULL);
}

-   ret = php_idate(format[0], ts, 0);
+   ret = php_idate(format[0], ts, 0 TSRMLS_CC);
if (ret == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unrecognized date 
format token.);
RETURN_FALSE;

Modified: php/php-src/trunk/ext/date/php_date.h
===
--- php/php-src/trunk/ext/date/php_date.h   2010-09-26 20:46:54 UTC (rev 
303772)
+++ php/php-src/trunk/ext/date/php_date.h   2010-09-27 01:19:57 UTC (rev 
303773)
@@ -163,7 +163,7 @@
 /* Backwards compability wrapper */
 PHPAPI signed long php_parse_date(char *string, signed long *now);
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
-PHPAPI int php_idate(char format, time_t ts, int localtime);
+PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC);
 #if HAVE_STRFTIME
 #define _php_strftime php_strftime
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/pdo_dblib/ dblib_stmt.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/zlib/zlib_fopen_wrapper.c trunk/ext/zlib/zlib_fopen_wrapper.c

Re: [PHP-CVS] svn: /php/php-src/trunk/ext/pdo_dblib/ dblib_stmt.c

[PHP-CVS] svn: /php/php-src/trunk/ UPGRADING.INTERNALS ext/date/php_date.c ext/date/php_date.h

4 matches

Site Navigation

Mail list logo

Footer information