date:20110610

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/apache/mod_php5.c trunk/sapi/apache/mod_php5.c

2011-06-10 Thread Rasmus Lerdorf

rasmus   Fri, 10 Jun 2011 11:46:35 +

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

Log:
Fix Apache1 build

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/apache/mod_php5.c
U   php/php-src/trunk/sapi/apache/mod_php5.c

Modified: php/php-src/branches/PHP_5_4/sapi/apache/mod_php5.c
===
--- php/php-src/branches/PHP_5_4/sapi/apache/mod_php5.c 2011-06-10 10:59:24 UTC 
(rev 312006)
+++ php/php-src/branches/PHP_5_4/sapi/apache/mod_php5.c 2011-06-10 11:46:35 UTC 
(rev 312007)
@@ -499,6 +499,7 @@
NULL,   /* treat data */
NULL,   /* exe location 
*/
0,  /* ini 
ignore */
+   0,  /* ini 
ignore cwd */
sapi_apache_get_fd,
sapi_apache_force_http_10,
sapi_apache_get_target_uid,

Modified: php/php-src/trunk/sapi/apache/mod_php5.c
===
--- php/php-src/trunk/sapi/apache/mod_php5.c2011-06-10 10:59:24 UTC (rev 
312006)
+++ php/php-src/trunk/sapi/apache/mod_php5.c2011-06-10 11:46:35 UTC (rev 
312007)
@@ -499,6 +499,7 @@
NULL,   /* treat data */
NULL,   /* exe location 
*/
0,  /* ini 
ignore */
+   0,  /* ini 
ignore cwd */
sapi_apache_get_fd,
sapi_apache_force_http_10,
sapi_apache_get_target_uid,

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/DateTime_diff_add_sub-absolute.phpt branches/PHP_5_3/ext/date/tests/DateTime_diff_add_sub-dates.phpt branches/PHP_5_3/ext/date/tests/Da

2011-06-10 Thread Daniel Convissor

Hi Hannes:

  Revision: http://svn.php.net/viewvc?view=revisionrevision=308238
 
  Log:
  Add extensive tests for DateTime::diff(), add() and sub().
 
 Are all of these supposed to be working?

Alas, no.  There are bugs in the way DateTime handles date math during
daylight/standard time transitions.

By the way, I have plans to adjust the tests to isolate the diff(),
add() and sub() tests and shorten the output to make things clearer.

Thanks,

--Dan

-- 
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/ext/oci8/ oci8_statement.c

2011-06-10 Thread Christopher Jones

sixd Fri, 10 Jun 2011 17:16:00 +

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

Log:
Missed trivial comment sync with PHP_5_4 and trunk

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c

Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c  2011-06-10 
14:55:34 UTC (rev 312015)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8_statement.c  2011-06-10 
17:16:00 UTC (rev 312016)
@@ -887,7 +887,7 @@
 * their reallocation but (i) any IN binds either interned or
 * not should already be null terminated and (ii) for OUT
 * binds, php_oci_bind_out_callback() should have allocated a
-* new string that can be realloced.
+* new string that we can modify here.
 */
Z_STRVAL_P(bind-zval) = erealloc(Z_STRVAL_P(bind-zval), 
Z_STRLEN_P(bind-zval)+1);
Z_STRVAL_P(bind-zval)[ Z_STRLEN_P(bind-zval) ] = '\0';

-- 
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/oci8/oci8.c branches/PHP_5_3/ext/oci8/oci8_interface.c branches/PHP_5_3/ext/oci8/php_oci8_int.h branches/PHP_5_3/ext/oci8/tests/

2011-06-10 Thread Christopher Jones

sixd Fri, 10 Jun 2011 17:38:07 +

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

Log:
Add oci_client_version() returning the runtime Oracle client library version - 
predominantly useful for the test suite

Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
U   php/php-src/branches/PHP_5_3/ext/oci8/oci8_interface.c
U   php/php-src/branches/PHP_5_3/ext/oci8/php_oci8_int.h
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/clientversion.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/clientversion_92.phpt
U   php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
U   php/php-src/branches/PHP_5_4/ext/oci8/oci8_interface.c
U   php/php-src/branches/PHP_5_4/ext/oci8/php_oci8_int.h
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/clientversion.phpt
A   php/php-src/branches/PHP_5_4/ext/oci8/tests/clientversion_92.phpt
U   php/php-src/trunk/ext/oci8/oci8.c
U   php/php-src/trunk/ext/oci8/oci8_interface.c
U   php/php-src/trunk/ext/oci8/php_oci8_int.h
A   php/php-src/trunk/ext/oci8/tests/clientversion.phpt
A   php/php-src/trunk/ext/oci8/tests/clientversion_92.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2011-06-10 17:16:00 UTC (rev 312016)
+++ php/php-src/branches/PHP_5_3/NEWS	2011-06-10 17:38:07 UTC (rev 312017)
@@ -125,6 +125,10 @@
   . Fixed bug #54992 (Stream not closed and error not returned when SSL
 CN_match fails). (Gustavo, laird_ngrps at dodo dot com dot au)

+- Oracle Database extension (OCI8):
+  . Added oci_client_version() returning the runtime Oracle client library
+version (Chris Jones)
+
 - PDO extension:
   . Fixed bug #54929 (Parse error with single quote in sql comment). (Felipe)
   . Fixed bug #52104 (bindColumn creates Warning regardless of ATTR_ERRMODE

Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c	2011-06-10 17:16:00 UTC (rev 312016)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c	2011-06-10 17:38:07 UTC (rev 312017)
@@ -447,6 +447,9 @@
 	ZEND_ARG_INFO(0, column_number_or_name)
 ZEND_END_ARG_INFO()

+ZEND_BEGIN_ARG_INFO(arginfo_oci_client_version, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_server_version, 0, 0, 1)
 	ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
@@ -681,6 +684,7 @@
 #define arginfo_oci_password_change		NULL
 #define arginfo_oci_new_cursor			NULL
 #define arginfo_oci_resultNULL
+#define arginfo_oci_client_version		NULL
 #define arginfo_oci_server_version		NULL
 #define arginfo_oci_statement_type		NULL
 #define arginfo_oci_num_rows			NULL
@@ -761,6 +765,7 @@
 PHP_FUNCTION(oci_parse);
 PHP_FUNCTION(oci_new_cursor);
 PHP_FUNCTION(oci_result);
+PHP_FUNCTION(oci_client_version);
 PHP_FUNCTION(oci_server_version);
 PHP_FUNCTION(oci_statement_type);
 PHP_FUNCTION(oci_num_rows);
@@ -836,6 +841,7 @@
 	PHP_FE(oci_parse,	arginfo_oci_parse)
 	PHP_FE(oci_new_cursor,arginfo_oci_new_cursor)
 	PHP_FE(oci_result,	arginfo_oci_result)
+	PHP_FE(oci_client_version,			arginfo_oci_client_version)
 	PHP_FE(oci_server_version,			arginfo_oci_server_version)
 	PHP_FE(oci_statement_type,			arginfo_oci_statement_type)
 	PHP_FE(oci_num_rows,arginfo_oci_num_rows)
@@ -1295,6 +1301,7 @@
 PHP_MINFO_FUNCTION(oci)
 {
 	char buf[32];
+	char *ver;

 	php_info_print_table_start();
 	php_info_print_table_row(2, OCI8 Support, enabled);
@@ -1306,6 +1313,11 @@
 	snprintf(buf, sizeof(buf), %ld, OCI_G(num_links));
 	php_info_print_table_row(2, Active Connections, buf);

+#if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  (OCI_MINOR_VERSION = 2)))
+	php_oci_client_get_version(ver TSRMLS_DC);
+	php_info_print_table_row(2, Oracle Run-time Client Library Version, ver);
+	efree(ver);
+#endif
 #if	defined(OCI_MAJOR_VERSION)  defined(OCI_MINOR_VERSION)
 	snprintf(buf, sizeof(buf), %d.%d, OCI_MAJOR_VERSION, OCI_MINOR_VERSION);
 #elif defined(PHP_OCI8_ORACLE_VERSION)
@@ -2384,6 +2396,30 @@
 	return 0;
 } /* }}} */

+
+/* {{{ php_oci_client_get_version()
+ *
+ * Get Oracle client library version
+ */
+void php_oci_client_get_version(char **version TSRMLS_DC)
+{
+	char  version_buff[256];
+	sword major_version = 0;
+	sword minor_version = 0;
+	sword update_num = 0;
+	sword patch_num = 0;
+	sword port_update_num = 0;
+
+#if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  (OCI_MINOR_VERSION = 2)))	/* OCIClientVersion only available 10.2 onwards */
+	PHP_OCI_CALL(OCIClientVersion, (major_version, minor_version, update_num, patch_num, port_update_num));
+	snprintf(version_buff, sizeof(version_buff), %d.%d.%d.%d.%d, major_version, minor_version, update_num, patch_num, port_update_num);
+#else
+	memcpy(version_buff, Unknown,

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/array_bind_001.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_002.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt branches/PHP_5_

2011-06-10 Thread Christopher Jones

sixd Fri, 10 Jun 2011 19:16:35 +

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

Log:
Add new OCI8 tests.  Refactor skipifs.  Sync 5.3/5.4/trunk branches

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_001.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_002.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_004.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_005.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_006.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_007.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_008.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_010.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_011.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_012.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_014.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_date.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_date1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_float.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_float1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_int.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_int1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_str.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_str1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/b47243_1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/b47243_2.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/b47243_3.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_long.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_long_raw.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_misccoltypes.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_misccoltypes_errs.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_number.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_query.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_raw.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_rowid.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_sqltafc.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_sqltchr_1.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_sqltchr_2.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_sqltint.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_sqltnum.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_unsupported_1.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_unsupported_2.phpt
A   php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_unsupported_3.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug26133.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_1_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2_11gR1.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug32325.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug35973.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug36010.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug36096.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug36403.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37220.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37581.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug38173.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug40078.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug40415.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug41069.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42134.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42173.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt
U

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/oci8/package.xml branches/PHP_5_4/ext/oci8/php_oci8.h trunk/ext/oci8/package.xml trunk/ext/oci8/php_oci8.h

2011-06-10 Thread Christopher Jones

sixd Fri, 10 Jun 2011 20:01:46 +

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

Log:
Bump OCI8 version to stable in preparation for 5.3.7 RC

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/oci8/package.xml
U   php/php-src/branches/PHP_5_4/ext/oci8/php_oci8.h
U   php/php-src/trunk/ext/oci8/package.xml
U   php/php-src/trunk/ext/oci8/php_oci8.h

Modified: php/php-src/branches/PHP_5_4/ext/oci8/package.xml
===
--- php/php-src/branches/PHP_5_4/ext/oci8/package.xml	2011-06-10 19:22:53 UTC (rev 312025)
+++ php/php-src/branches/PHP_5_4/ext/oci8/package.xml	2011-06-10 20:01:46 UTC (rev 312026)
@@ -33,12 +33,12 @@
   activeno/active
  /lead

- date2010-12-09/date
- time20:00:00/time
+ date2011-06-10/date
+ time12:00:00/time

  version
-  release1.4.5/release
-  api1.4.5/api
+  release1.4.6/release
+  api1.4.6/api
  /version
  stability
   releasestable/release
@@ -46,7 +46,8 @@
  /stability
  license uri=http://www.php.net/license;PHP/license
  notes
-Protect against null bytes in LOB filenames (http://news.php.net/php.internals/50202)
+   Added oci_client_version() returning the runtime Oracle client library version
+   Made OCI8 extension buildable with PHP 5.4-development code
  /notes
  contents
   dir name=/
@@ -87,8 +88,20 @@
 file name=bind_empty.phpt role=test /
 file name=bind_long.phpt role=test /
 file name=bind_long_raw.phpt role=test /
+file name=bind_misccoltypes_errs.phpt role=test /
+file name=bind_misccoltypes.phpt role=test /
+file name=bind_number.phpt role=test /
+file name=bind_query.phpt role=test /
 file name=bind_raw.phpt role=test /
 file name=bind_rowid.phpt role=test /
+file name=bind_sqltafc.phpt role=test /
+file name=bind_sqltchr_1.phpt role=test /
+file name=bind_sqltchr_2.phpt role=test /
+file name=bind_sqltint.phpt role=test /
+file name=bind_sqltnum.phpt role=test /
+file name=bind_unsupported_1.phpt role=test /
+file name=bind_unsupported_2.phpt role=test /
+file name=bind_unsupported_3.phpt role=test /
 file name=bug26133.phpt role=test /
 file name=bug27303_1_11gR1.phpt role=test /
 file name=bug27303_1.phpt role=test /
@@ -125,8 +138,12 @@
 file name=bug46994.phpt role=test /
 file name=bug47189.phpt role=test /
 file name=bug47281.phpt role=test /
+file name=bug47281_tt.phpt role=test /
 file name=bug51253.phpt role=test /
-file name=bug51291.phpt role=test /
+file name=bug51291_1.phpt role=test /
+file name=bug51291_2.phpt role=test /
+file name=clientversion_92.phpt role=test /
+file name=clientversion.phpt role=test /
 file name=close.phpt role=test /
 file name=coll_001.phpt role=test /
 file name=coll_002_func.phpt role=test /
@@ -193,15 +210,19 @@
 file name=cursor_bind.phpt role=test /
 file name=cursors_old.phpt role=test /
 file name=cursors.phpt role=test /
+file name=dbmsoutput.phpt role=test /
 file name=debug.phpt role=test /
+file name=default_prefetch0.phpt role=test /
 file name=default_prefetch1.phpt role=test /
 file name=default_prefetch2.phpt role=test /
 file name=default_prefetch.phpt role=test /
+file name=define0.phpt role=test /
 file name=define1.phpt role=test /
 file name=define2.phpt role=test /
 file name=define3.phpt role=test /
 file name=define4.phpt role=test /
 file name=define5.phpt role=test /
+file name=define6.phpt role=test /
 file name=define_old.phpt role=test /
 file name=define.phpt role=test /
 file name=descriptors.phpt role=test /
@@ -225,6 +246,7 @@
 file name=driver_name.phpt role=test /
 file name=drop_table.inc role=test /
 file name=drop_type.inc role=test /
+file name=dupcolnames.phpt role=test /
 file name=edition_1.phpt role=test /
 file name=edition_2.phpt role=test /
 file name=error1.phpt role=test /
@@ -239,6 +261,7 @@
 file name=extauth_02.phpt role=test /
 file name=extauth_03.phpt role=test /
 file name=extauth_04.phpt role=test /
+file name=fetch_all1.phpt role=test /
 file name=fetch_all2.phpt role=test /
 file name=fetch_all3.phpt role=test /
 file name=fetch_all4.phpt role=test /
@@ -249,12 +272,15 @@
 file name=fetch_into1.phpt role=test /
 file name=fetch_into2.phpt role=test /
 file name=fetch_into.phpt role=test /
+file name=fetch_object_1.phpt role=test /
 file name=fetch_object_2.phpt role=test /
 file name=fetch_object.phpt role=test /
 file name=fetch.phpt role=test /
 file name=fetch_row.phpt role=test /
+file name=field_funcs0.phpt role=test /
 file name=field_funcs1.phpt role=test /
 file name=field_funcs2.phpt role=test /
+file name=field_funcs3.phpt role=test /
 file name=field_funcs_old.phpt role=test /
 file name=field_funcs.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/xp_ssl.c branches/PHP_5_4/ext/openssl/xp_ssl.c trunk/ext/openssl/xp_ssl.c

2011-06-10 Thread Felipe Pena

felipe   Fri, 10 Jun 2011 22:48:36 +

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

Log:
- Fixed bug #55028 (// is abad comment)

Bug: http://bugs.php.net/55028 (Open) // is  abad comment
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
U   php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c
U   php/php-src/trunk/ext/openssl/xp_ssl.c

Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2011-06-10 22:13:08 UTC 
(rev 312030)
+++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c   2011-06-10 22:48:36 UTC 
(rev 312031)
@@ -145,7 +145,7 @@

default:
do {
-   // NULL is automatically added
+   /* NULL is automatically added 
*/
ERR_error_string_n(ecode, 
esbuf, sizeof(esbuf));
if (ebuf.c) {

smart_str_appendc(ebuf, '\n');

Modified: php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c   2011-06-10 22:13:08 UTC 
(rev 312030)
+++ php/php-src/branches/PHP_5_4/ext/openssl/xp_ssl.c   2011-06-10 22:48:36 UTC 
(rev 312031)
@@ -145,7 +145,7 @@

default:
do {
-   // NULL is automatically added
+   /* NULL is automatically added 
*/
ERR_error_string_n(ecode, 
esbuf, sizeof(esbuf));
if (ebuf.c) {

smart_str_appendc(ebuf, '\n');

Modified: php/php-src/trunk/ext/openssl/xp_ssl.c
===
--- php/php-src/trunk/ext/openssl/xp_ssl.c  2011-06-10 22:13:08 UTC (rev 
312030)
+++ php/php-src/trunk/ext/openssl/xp_ssl.c  2011-06-10 22:48:36 UTC (rev 
312031)
@@ -145,7 +145,7 @@

default:
do {
-   // NULL is automatically added
+   /* NULL is automatically added 
*/
ERR_error_string_n(ecode, 
esbuf, sizeof(esbuf));
if (ebuf.c) {

smart_str_appendc(ebuf, '\n');

-- 
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/ext/pdo_pgsql/pgsql_driver.c branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c branches/PHP_5_4/ext/spl/spl_observer.c trunk/ext/pdo_pgsql/pgsql_driver.c trun

2011-06-10 Thread Felipe Pena

felipe   Fri, 10 Jun 2011 23:14:15 +

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

Log:
- Drop C++ style comments

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c
U   php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c
U   php/php-src/branches/PHP_5_4/ext/spl/spl_observer.c
U   php/php-src/trunk/ext/pdo_pgsql/pgsql_driver.c
U   php/php-src/trunk/ext/spl/spl_observer.c

Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2011-06-10 
22:48:36 UTC (rev 312031)
+++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c   2011-06-10 
23:14:15 UTC (rev 312032)
@@ -533,7 +533,7 @@
spprintf(query, 0, COPY %s FROM STDIN DELIMITERS E'%c' WITH 
NULL AS E'%s', table_name, (pg_delim_len ? *pg_delim : '\t'), (pg_null_as_len 
? pg_null_as : N));
}

-   // Obtain db Handle
+   /* Obtain db Handle */
H = (pdo_pgsql_db_handle *)dbh-driver_data;

while ((pgsql_result = PQgetResult(H-server))) {
@@ -625,7 +625,7 @@
return;
}

-   // Obtain db Handler
+   /* Obtain db Handler */
dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
PDO_CONSTRUCT_CHECK;


Modified: php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c   2011-06-10 
22:48:36 UTC (rev 312031)
+++ php/php-src/branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c   2011-06-10 
23:14:15 UTC (rev 312032)
@@ -542,7 +542,7 @@
spprintf(query, 0, COPY %s FROM STDIN DELIMITERS E'%c' WITH 
NULL AS E'%s', table_name, (pg_delim_len ? *pg_delim : '\t'), (pg_null_as_len 
? pg_null_as : N));
}

-   // Obtain db Handle
+   /* Obtain db Handle */
H = (pdo_pgsql_db_handle *)dbh-driver_data;

while ((pgsql_result = PQgetResult(H-server))) {
@@ -634,7 +634,7 @@
return;
}

-   // Obtain db Handler
+   /* Obtain db Handler */
dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
PDO_CONSTRUCT_CHECK;


Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_observer.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_observer.c 2011-06-10 22:48:36 UTC 
(rev 312031)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_observer.c 2011-06-10 23:14:15 UTC 
(rev 312032)
@@ -170,7 +170,7 @@
efree(hash);
} else {
 #if HAVE_PACKED_OBJECT_VALUE
-   // Nothing to do
+   /* Nothing to do */
 #else
efree(hash);
 #endif

Modified: php/php-src/trunk/ext/pdo_pgsql/pgsql_driver.c
===
--- php/php-src/trunk/ext/pdo_pgsql/pgsql_driver.c  2011-06-10 22:48:36 UTC 
(rev 312031)
+++ php/php-src/trunk/ext/pdo_pgsql/pgsql_driver.c  2011-06-10 23:14:15 UTC 
(rev 312032)
@@ -542,7 +542,7 @@
spprintf(query, 0, COPY %s FROM STDIN DELIMITERS E'%c' WITH 
NULL AS E'%s', table_name, (pg_delim_len ? *pg_delim : '\t'), (pg_null_as_len 
? pg_null_as : N));
}

-   // Obtain db Handle
+   /* Obtain db Handle */
H = (pdo_pgsql_db_handle *)dbh-driver_data;

while ((pgsql_result = PQgetResult(H-server))) {
@@ -634,7 +634,7 @@
return;
}

-   // Obtain db Handler
+   /* Obtain db Handler */
dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
PDO_CONSTRUCT_CHECK;


Modified: php/php-src/trunk/ext/spl/spl_observer.c
===
--- php/php-src/trunk/ext/spl/spl_observer.c2011-06-10 22:48:36 UTC (rev 
312031)
+++ php/php-src/trunk/ext/spl/spl_observer.c2011-06-10 23:14:15 UTC (rev 
312032)
@@ -170,7 +170,7 @@
efree(hash);
} else {
 #if HAVE_PACKED_OBJECT_VALUE
-   // Nothing to do
+   /* Nothing to do */
 #else
efree(hash);
 #endif

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread Rasmus Lerdorf

rasmus   Fri, 10 Jun 2011 23:43:19 +

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

Log:
Karma for dsp

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-10 23:14:15 UTC (rev 312032)
+++ SVNROOT/global_avail2011-06-10 23:43:19 UTC (rev 312033)
@@ -7,7 +7,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.

@@ -129,7 +129,7 @@
 avail|changelog|php/php-src,gtk/php-gtk

 # Some people have access to change the day-to-day code on the various php.net 
machines
-avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms|systems
+avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp|systems

 # Finally, there are various people with access to various bits and
 # pieces of other SVN modules.

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread Rasmus Lerdorf

rasmus   Sat, 11 Jun 2011 00:09:34 +

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

Log:
test

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-10 23:43:19 UTC (rev 312033)
+++ SVNROOT/global_avail2011-06-11 00:09:34 UTC (rev 312034)
@@ -7,7 +7,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.


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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread Rasmus Lerdorf

rasmus   Sat, 11 Jun 2011 00:10:03 +

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

Log:
Fixed?

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:09:34 UTC (rev 312034)
+++ SVNROOT/global_avail2011-06-11 00:10:03 UTC (rev 312035)
@@ -7,7 +7,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.


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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread Rasmus Lerdorf

rasmus   Sat, 11 Jun 2011 00:11:30 +

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

Log:
Try this

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:10:03 UTC (rev 312035)
+++ SVNROOT/global_avail2011-06-11 00:11:30 UTC (rev 312036)
@@ -7,7 +7,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.

@@ -388,6 +388,6 @@

 # But members of the PHP Group get access to everything.
 # Note: This line MUST be at the end so that it overrides any unavail settings
-avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane
+avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane,dsp

 # vim:set ft=conf sw=2 ts=2 et:

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread David Soria Parra

dsp  Sat, 11 Jun 2011 00:12:10 +

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

Log:
give tyrael karma to web/pecl

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:11:30 UTC (rev 312036)
+++ SVNROOT/global_avail2011-06-11 00:12:10 UTC (rev 312037)
@@ -97,7 +97,7 @@
 avail|grossolini|web/php-wiki

 # access to the pecl website etc
-avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani,johannes,sfox,gloob,till|web/pecl,pecl
+avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani,johannes,sfox,gloob,till,tyrael|web/pecl,pecl

 # access to the newly cut pecl4win website
 avail|edink,derick|web/pecl4win

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread David Soria Parra

dsp  Sat, 11 Jun 2011 00:16:37 +

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

Log:
fixed?

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:12:10 UTC (rev 312037)
+++ SVNROOT/global_avail2011-06-11 00:16:37 UTC (rev 312038)
@@ -7,7 +7,7 @@

 # Some people also have access to the configuration files in the SVNROOT.

-avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori|SVNROOT
+avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas,johannes,gwynne,lsmith,bjori,dsp|SVNROOT

 # Some PEAR people get access to the pear-specific avail file in SVNROOT.

@@ -388,6 +388,6 @@

 # But members of the PHP Group get access to everything.
 # Note: This line MUST be at the end so that it overrides any unavail settings
-avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane,dsp
+avail|andi,andrei,jimw,rasmus,rubys,sas,ssb,thies,zeev,shane

 # vim:set ft=conf sw=2 ts=2 et:

-- 
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/ext/oci8/oci8.c branches/PHP_5_4/ext/oci8/oci8.c trunk/ext/oci8/oci8.c

2011-06-10 Thread Christopher Jones

sixd Sat, 11 Jun 2011 00:24:26 +

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

Log:
Fix TSRMLS for Windows build

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
U   php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
U   php/php-src/trunk/ext/oci8/oci8.c

Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-06-11 00:16:37 UTC 
(rev 312038)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2011-06-11 00:24:26 UTC 
(rev 312039)
@@ -1314,7 +1314,7 @@
php_info_print_table_row(2, Active Connections, buf);

 #if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2)))
-   php_oci_client_get_version(ver TSRMLS_DC);
+   php_oci_client_get_version(ver TSRMLS_CC);
php_info_print_table_row(2, Oracle Run-time Client Library Version, 
ver);
efree(ver);
 #endif

Modified: php/php-src/branches/PHP_5_4/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-06-11 00:16:37 UTC 
(rev 312038)
+++ php/php-src/branches/PHP_5_4/ext/oci8/oci8.c2011-06-11 00:24:26 UTC 
(rev 312039)
@@ -1314,7 +1314,7 @@
php_info_print_table_row(2, Active Connections, buf);

 #if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2)))
-   php_oci_client_get_version(ver TSRMLS_DC);
+   php_oci_client_get_version(ver TSRMLS_CC);
php_info_print_table_row(2, Oracle Run-time Client Library Version, 
ver);
efree(ver);
 #endif

Modified: php/php-src/trunk/ext/oci8/oci8.c
===
--- php/php-src/trunk/ext/oci8/oci8.c   2011-06-11 00:16:37 UTC (rev 312038)
+++ php/php-src/trunk/ext/oci8/oci8.c   2011-06-11 00:24:26 UTC (rev 312039)
@@ -1314,7 +1314,7 @@
php_info_print_table_row(2, Active Connections, buf);

 #if ((OCI_MAJOR_VERSION  10) || ((OCI_MAJOR_VERSION == 10)  
(OCI_MINOR_VERSION = 2)))
-   php_oci_client_get_version(ver TSRMLS_DC);
+   php_oci_client_get_version(ver TSRMLS_CC);
php_info_print_table_row(2, Oracle Run-time Client Library Version, 
ver);
efree(ver);
 #endif

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread David Soria Parra

dsp  Sat, 11 Jun 2011 00:26:40 +

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

Log:
Remove me from systems

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:24:26 UTC (rev 312039)
+++ SVNROOT/global_avail2011-06-11 00:26:40 UTC (rev 312040)
@@ -129,7 +129,7 @@
 avail|changelog|php/php-src,gtk/php-gtk

 # Some people have access to change the day-to-day code on the various php.net 
machines
-avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp|systems
+avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms|systems

 # Finally, there are various people with access to various bits and
 # pieces of other SVN modules.

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

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-06-10 Thread David Soria Parra

dsp  Sat, 11 Jun 2011 00:28:14 +

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

Log:
Add me to systems

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-06-11 00:26:40 UTC (rev 312040)
+++ SVNROOT/global_avail2011-06-11 00:28:14 UTC (rev 312041)
@@ -129,7 +129,7 @@
 avail|changelog|php/php-src,gtk/php-gtk

 # Some people have access to change the day-to-day code on the various php.net 
machines
-avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms|systems
+avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp|systems

 # Finally, there are various people with access to various bits and
 # pieces of other SVN modules.

-- 
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/ext/sybase_ct/php_sybase_ct.c branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c trunk/ext/sybase_ct/php_sybase_ct.c

2011-06-10 Thread Felipe Pena

felipe   Sat, 11 Jun 2011 01:15:14 +

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

Log:
- Possible fix for bug #55022 (memory_limit exhausted when set charset in 
sybase_connect)

Bug: http://bugs.php.net/55022 (Open) memory_limit exhausted when set charset 
in sybase_connect
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c

Modified: php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
00:34:53 UTC (rev 312043)
+++ php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
01:15:14 UTC (rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

Modified: php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
00:34:53 UTC (rev 312043)
+++ php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
01:15:14 UTC (rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

Modified: php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-06-11 00:34:53 UTC 
(rev 312043)
+++ php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-06-11 01:15:14 UTC 
(rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

-- 
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_4/sapi/apache/mod_php5.c trunk/sapi/apache/mod_php5.c

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/DateTime_diff_add_sub-absolute.phpt branches/PHP_5_3/ext/date/tests/DateTime_diff_add_sub-dates.phpt branches/PHP_5_3/ext/date/tests/Da

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/oci8/ oci8_statement.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/oci8/oci8.c branches/PHP_5_3/ext/oci8/oci8_interface.c branches/PHP_5_3/ext/oci8/php_oci8_int.h branches/PHP_5_3/ext/oci8/tests/

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/array_bind_001.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_002.phpt branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt branches/PHP_5_

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/oci8/package.xml branches/PHP_5_4/ext/oci8/php_oci8.h trunk/ext/oci8/package.xml trunk/ext/oci8/php_oci8.h

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/openssl/xp_ssl.c branches/PHP_5_4/ext/openssl/xp_ssl.c trunk/ext/openssl/xp_ssl.c

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_pgsql/pgsql_driver.c branches/PHP_5_4/ext/pdo_pgsql/pgsql_driver.c branches/PHP_5_4/ext/spl/spl_observer.c trunk/ext/pdo_pgsql/pgsql_driver.c trun

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/oci8.c branches/PHP_5_4/ext/oci8/oci8.c trunk/ext/oci8/oci8.c

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /SVNROOT/ global_avail

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c trunk/ext/sybase_ct/php_sybase_ct.c

18 matches

Site Navigation

Mail list logo

Footer information