[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Nov 9 01:32:22 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3222r2=1.3223diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3222 php-src/ChangeLog:1.3223 --- php-src/ChangeLog:1.3222Sat Nov 8 01:33:07 2008 +++ php-src/ChangeLog Sun Nov 9 01:32:21 2008 @@ -1,3 +1,106 @@ +2008-11-08 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_3) + sapi/cgi/cgi_main.c: + Fix for bug #46525 + +* (PHP_5_2) + sapi/cgi/cgi_main.c: + Potential fix for bug #46525 + +2008-11-08 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/sybase_ct/tests/skipif.inc + ext/sybase_ct/tests/skipif.inc: + - MFH: Added connection checking on SKIPIF + +* ext/sybase_ct/tests/skipif.inc: + - Added connection checking on SKIPIF + +2008-11-08 Timm Friebe [EMAIL PROTECTED] + +* (PHP_5_2) + ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt: + - MFB: Initial release + +* (PHP_5_2) + ext/sybase_ct/tests/bug30312.phpt: + - MFB: Made this test independent of date format + +* (PHP_5_2) + ext/sybase_ct/php_sybase_ct.c: + - MFB: Fixed problems with segmentation faults when using unbuffered + queries + +* (PHP_5_3) + ext/sybase_ct/tests/bug29064.phpt + ext/sybase_ct/tests/bug29064.phpt: + - Adjusted tests to reality + +* (PHP_5_3) + ext/sybase_ct/php_sybase_ct.c: + - Fixed problems with segmentation faults when using unbuffered queries + +* (PHP_5_3) + ext/sybase_ct/tests/bug30312.phpt: + - Made this test independent of date format + +* ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt + ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt + ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt: +1.1.4; + file test_unbuffered_no_full_fetch.phpt was initially added on branch + PHP_5_3. + +* (PHP_5_3) + ext/sybase_ct/php_sybase_ct.c: + - QA: Unified error messages in php_sybase_query() + +* (PHP_5_2) + ext/sybase_ct/php_sybase_ct.c: + - MFB: Changed while loop in php_sybase_fetch_result_row() to also read + rows with +retcode == CS_ROW_FAIL. + +* (PHP_5_3) + ext/sybase_ct/php_sybase_ct.c: + - Changed while loop in php_sybase_fetch_result_row() to also read rows + with +retcode == CS_ROW_FAIL. + +* (PHP_5_2) + ext/sybase_ct/tests/test_appname.phpt: + - MFB: Made this test independent of field types in master..sysprocesses + +* (PHP_5_2) + ext/sybase_ct/tests/test.inc + ext/sybase_ct/tests/test.inc: + - Changed source to read host, user and password from environment + +* (PHP_5_3) + ext/sybase_ct/tests/test_appname.phpt: + - Made this test independent of field types in master..sysprocesses + +* (PHP_5_3) + ext/sybase_ct/tests/test_msghandler.phpt: + - Fixed expected warning messages + +2008-11-08 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/zend_language_parser.y: + fix more invalid reads + +2008-11-08 Scott MacVicar [EMAIL PROTECTED] + +* (PHP_5_2) + run-tests.php: + MFH: Support versions of valgrind from SVN. The version is shown as + 3.4.0.SVN + + Save the bunnies + 2008-11-07 Felipe Pena [EMAIL PROTECTED] * (PHP_5_2) @@ -11505,7 +11608,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3222 2008/11/08 01:33:07 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3223 2008/11/09 01:32:21 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Nov 9 01:32:27 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1394r2=1.1395diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1394 ZendEngine2/ChangeLog:1.1395 --- ZendEngine2/ChangeLog:1.1394Sat Nov 8 01:33:12 2008 +++ ZendEngine2/ChangeLog Sun Nov 9 01:32:26 2008 @@ -1,3 +1,9 @@ +2008-11-08 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + zend_language_parser.y: + fix more invalid reads + 2008-11-07 Antony Dovgal [EMAIL PROTECTED] * (PHP_5_3) @@ -26434,7 +26440,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1394 2008/11/08 01:33:12 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1395 2008/11/09 01:32:26 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -28158,7 +28164,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1394 2008/11/08 01:33:12 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1395 2008/11/09 01:32:26 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests test_appname.phpt
thekid Sat Nov 8 12:01:10 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/teststest_appname.phpt
Log:
- MFB: Made this test independent of field types in master..sysprocesses
# char on ASE 11, varchar on ASE 15
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_appname.phpt?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_appname.phpt
diff -u php-src/ext/sybase_ct/tests/test_appname.phpt:1.2
php-src/ext/sybase_ct/tests/test_appname.phpt:1.2.4.1
--- php-src/ext/sybase_ct/tests/test_appname.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/test_appname.phpt Sat Nov 8 12:01:10 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_appname.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: test_appname.phpt,v 1.2.4.1 2008/11/08 12:01:10 thekid Exp $
*/
require('test.inc');
@@ -35,7 +35,6 @@
);
var_dump(
-$r,
compare_string($program_name, $r[0]['program_name']),
compare_string($hostname, $r[0]['hostname'])
);
@@ -52,14 +51,5 @@
where
program_name = phpt_test
Return: resource
-array(1) {
- [0]=
- array(2) {
-[hostname]=
-string(10) php.net%s
-[program_name]=
-string(16) phpt_test%s
- }
-}
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
thekid Sat Nov 8 13:22:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- Fixed problems with segmentation faults when using unbuffered queries
# Double-freeing results caused these
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.10r2=1.103.2.5.2.13.2.11diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.10
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.11
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.10 Sat Nov 8
12:24:52 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 13:22:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.10 2008/11/08 12:24:52 thekid Exp $
*/
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.11 2008/11/08 13:22:14 thekid Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -273,6 +273,21 @@
#define efree_n(x) { efree(x); x = NULL; }
#define efree_if(x) if (x) efree_n(x)
+#ifdef PHP_SYBASE_DEBUG
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ fprintf(stderr, _free_sybase_result(%p) called from line #%d\n,
result, __LINE__); \
+ fflush(stderr);
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#else
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#endif
static void _free_sybase_result(sybase_result *result)
{
int i, j;
@@ -326,7 +341,7 @@
php_sybase_finish_results(result TSRMLS_CC);
}
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
}
static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -1166,8 +1181,6 @@
case CS_CANCELED:
default:
- _free_sybase_result(result);
- result = NULL;
retcode = CS_FAIL;
break;
}
@@ -1273,7 +1286,7 @@
break;
default:
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
result = NULL;
retcode = CS_FAIL; /* Just to be sure */
break;
@@ -1463,17 +1476,9 @@
INIT_PZVAL(tmp);
ZEND_FETCH_RESOURCE(result, sybase_result *, tmp, -1, Sybase
result, le_result);
- /* Causes the following segfault:
- Program received signal SIGSEGV, Segmentation fault.
- 0x8144380 in _efree (ptr=0x81fe024,
__zend_filename=0x81841a0 php4/ext/sybase_ct/php_sybase_ct.c,
- __zend_lineno=946, __zend_orig_filename=0x0,
__zend_orig_lineno=0) at php4/Zend/zend_alloc.c:229
- php4/Zend/zend_alloc.c:229:7284:beg:0x8144380
- */
- #if O_TIMM
if (result) {
php_sybase_finish_results(result TSRMLS_CC);
}
- #endif
zval_ptr_dtor(tmp);
zend_list_delete(sybase_ptr-active_result_index);
@@ -1628,9 +1633,7 @@
/* Retry deadlocks up until deadlock_retry_count times */
if (sybase_ptr-deadlock SybCtG(deadlock_retry_count) != -1
++deadlock_count SybCtG(deadlock_retry_count)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Retried deadlock %d times [max: %ld], giving up, deadlock_count- 1,
SybCtG(deadlock_retry_count));
- if (result != NULL) {
- _free_sybase_result(result);
- }
+ FREE_SYBASE_RESULT(result);
break;
}
@@ -1649,9 +1652,7 @@
* optimization, we could try not to fetch results in known
* deadlock conditions, but deadlock is (should be) rare.
*/
- if (result != NULL) {
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests test_appname.phpt
thekid Sat Nov 8 11:46:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/teststest_appname.phpt
Log:
- Made this test independent of field types in master..sysprocesses
# char on ASE 11, varchar on ASE 15
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_appname.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_appname.phpt
diff -u php-src/ext/sybase_ct/tests/test_appname.phpt:1.2
php-src/ext/sybase_ct/tests/test_appname.phpt:1.2.6.1
--- php-src/ext/sybase_ct/tests/test_appname.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/test_appname.phpt Sat Nov 8 11:46:06 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_appname.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: test_appname.phpt,v 1.2.6.1 2008/11/08 11:46:06 thekid Exp $
*/
require('test.inc');
@@ -35,7 +35,6 @@
);
var_dump(
-$r,
compare_string($program_name, $r[0]['program_name']),
compare_string($hostname, $r[0]['hostname'])
);
@@ -52,14 +51,5 @@
where
program_name = phpt_test
Return: resource
-array(1) {
- [0]=
- array(2) {
-[hostname]=
-string(10) php.net%s
-[program_name]=
-string(16) phpt_test%s
- }
-}
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
Hi, - MFB: Changed while loop in php_sybase_fetch_result_row() to also read rows with retcode == CS_ROW_FAIL. # Reported by Detlef Neumerkel and Frank Irnich of Sybase Thanks for this commit :) Please add the NEWS entry as well. Tried so: $ cvs ci -m '- Added notes in fixes to ext/sybase_ct' NEWS COMMITINFO /repository/php-src NEWS Access denied: insufficient karma (thekid|php-src) Contact [EMAIL PROTECTED] for access to php-src cvs commit: Pre-commit check failed cvs [commit aborted]: correct above errors first! Could someone w/ sufficient karma commit add these lines to PHP_5_3/NEWS: == - Fixed sybase_unbuffered_query() crashes when not reading all results (Timm) - Fixed sybase_fetch_*() functions to also read rows with CS_ROW_FAIL (Timm) == Thanks in advance! - Timm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests test_msghandler.phpt
thekid Sat Nov 8 11:45:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/teststest_msghandler.phpt
Log:
- Fixed expected warning messages
# Changed during migration to parameter parsing API
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.2.6.1r2=1.2.6.1.2.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2.6.1
php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2.6.1.2.1
--- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2.6.1Tue May 22
11:33:36 2007
+++ php-src/ext/sybase_ct/tests/test_msghandler.phptSat Nov 8 11:45:03 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler.phpt,v 1.2.6.1 2007/05/22 11:33:36 thekid Exp $
+ * $Id: test_msghandler.phpt,v 1.2.6.1.2.1 2008/11/08 11:45:03 thekid Exp $
*/
require('test.inc');
@@ -26,15 +26,15 @@
?
--EXPECTF--
Nonexistant:
-Warning: sybase_set_message_handler(): First argumented is expected to be a
valid callback, 'function_does_not_exist' was given in %stest.inc on line %d
-bool(false)
+Warning: sybase_set_message_handler() expects parameter 1 to be a valid
callback, function 'function_does_not_exist' not found or invalid function name
in %stest.inc on line %d
+NULL
Static method: bool(true)
Instance method: bool(true)
Lambda function: bool(true)
Unset: bool(true)
Incorrect type:
-Warning: sybase_set_message_handler(): First argumented is expected to be
either NULL, an array or string, integer given in %stest.inc on line %d
-bool(false)
+Warning: sybase_set_message_handler() expects parameter 1 to be a valid
callback, no array or string given in %stest.inc on line %d
+NULL
Function:bool(true)
Query: select getdate(NULL)
*** Caught Sybase Server Message #%d [Severity %d, state %d] at line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
thekid Sat Nov 8 12:24:52 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- QA: Unified error messages in php_sybase_query()
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.9r2=1.103.2.5.2.13.2.10diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.9
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.10
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.9Sat Nov 8
12:05:46 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 12:24:52 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.9 2008/11/08 12:05:46 thekid Exp $
*/
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.10 2008/11/08 12:24:52 thekid Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1431,12 +1431,12 @@
}
if (!store !buffered) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, cannot use
non-storing mode with buffered queries);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Sybase: Cannot use
non-storing mode with buffered queries);
store = 1;
}
if (php_sybase_connection_id(sybase_link_index, id TSRMLS_CC) ==
FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase: No
connection to close);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase: No
connection);
RETURN_FALSE;
}
@@ -1451,7 +1451,7 @@
if (sybase_ptr-active_result_index) {
zval *tmp = NULL;
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, called without
first fetching all rows from a previous unbuffered query);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Sybase: Called
without first fetching all rows from a previous unbuffered query);
if (sybase_ptr-cmd) {
ct_cancel(NULL, sybase_ptr-cmd, CS_CANCEL_ALL);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests bug30312.phpt
thekid Sat Nov 8 14:24:38 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/testsbug30312.phpt
Log:
- MFB: Made this test independent of date format
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug30312.phpt?r1=1.1.4.1r2=1.1.4.2diff_format=u
Index: php-src/ext/sybase_ct/tests/bug30312.phpt
diff -u php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.1
php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.2
--- php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.1 Wed Mar 14 11:46:06 2007
+++ php-src/ext/sybase_ct/tests/bug30312.phpt Sat Nov 8 14:24:38 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug30312.phpt,v 1.1.4.1 2007/03/14 11:46:06 thekid Exp $
+ * $Id: bug30312.phpt,v 1.1.4.2 2008/11/08 14:24:38 thekid Exp $
*/
require('test.inc');
@@ -14,14 +14,14 @@
$db= sybase_connect_ex();
- $query= sybase_unbuffered_query('select getdate()');
+ $query= sybase_unbuffered_query('select datepart(yy, getdate())');
$array= sybase_fetch_array($query);
var_dump($array[0]);
- $query= sybase_unbuffered_query('select getdate()');
+ $query= sybase_unbuffered_query('select datepart(yy, getdate())');
$array= sybase_fetch_array($query);
var_dump($array[0]);
?
--EXPECTF--
-string(%d) %s %d %d %d:%d%s
-string(%d) %s %d %d %d:%d%s
+int(%d)
+int(%d)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests bug29064.phpt
thekid Sat Nov 8 14:24:55 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/testsbug29064.phpt
Log:
- Adjusted tests to reality
# We select 123456789.12345679, we should have this returned and not
# something 123456789.123457 (rounded)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug29064.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug29064.phpt
diff -u php-src/ext/sybase_ct/tests/bug29064.phpt:1.1
php-src/ext/sybase_ct/tests/bug29064.phpt:1.1.6.1
--- php-src/ext/sybase_ct/tests/bug29064.phpt:1.1 Sun Jul 11 16:57:24 2004
+++ php-src/ext/sybase_ct/tests/bug29064.phpt Sat Nov 8 14:24:55 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug29064.phpt,v 1.1 2004/07/11 16:57:24 thekid Exp $
+ * $Id: bug29064.phpt,v 1.1.6.1 2008/11/08 14:24:55 thekid Exp $
*/
require('test.inc');
@@ -112,9 +112,9 @@
[test_tinyint]=
int(123)
[test_real]=
-string(16) 123456789.123457
+string(18) 123456789.12345679
[test_double]=
-string(16) 123456789.123457
+string(18) 123456789.12345679
}
[1]=
array(10) {
@@ -135,9 +135,9 @@
[test_tinyint]=
int(255)
[test_real]=
-string(17) -123456789.123457
+string(19) -123456789.12345679
[test_double]=
-string(17) -123456789.123457
+string(19) -123456789.12345679
}
}
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests test_unbuffered_no_full_fetch.phpt
thekid Sat Nov 8 14:28:26 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/sybase_ct/teststest_unbuffered_no_full_fetch.phpt Log: - MFB: Initial release http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt?view=markuprev=1.1 Index: php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt +++ php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
On Sat, Nov 8, 2008 at 2:39 PM, Timm Friebe [EMAIL PROTECTED] wrote: Hi, If it fixes a crash, please merge to 5.2. And also add a NEWS entry. Will do as soon as I'm able to compile PHP_5_2: F:\cygwin\home\Timm Friebe\devel\php\php_5_2nmake Microsoft (R) Program Maintenance Utility Version 8.00.50727.762 Copyright (C) Microsoft Corporation. All rights reserved. \cygwin\bin\flex.exe -i -SZend/flex.skl -Pzend -oZend/zend_language_scan ner.c Zend/zend_language_scanner.l flex: fatal internal error, bad line in skeleton file NMAKE : fatal error U1077: '\cygwin\bin\flex.exe' : return code '0x1' Stop. http://pecl2.php.net/downloads/php-windows-builds/php-libs/binary-tools.zip contains the version we use for all bins (re2c, flex, bison, etc.). I wonder if you read you @php.net alias... :) Hrm, I probably missed your e-mail due to the immense ammounts of SPAM I get. :( I also tried to contact you before IPC (about sybase). Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Sat Nov 8 14:37:14 2008 UTC Modified files: /CVSROOTavail Log: - NEWS karma for Timm http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1466r2=1.1467diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1466 CVSROOT/avail:1.1467 --- CVSROOT/avail:1.1466Fri Nov 7 21:32:07 2008 +++ CVSROOT/avail Sat Nov 8 14:37:13 2008 @@ -185,7 +185,7 @@ avail|eriksson|php-src/ext/satellite avail|chrisv,sterling|php-src/ext/sockets avail|sterling|php-src/ext/swf -avail|tommay,pwmoosman,thekid|php-src/ext/sybase_ct +avail|tommay,pwmoosman,thekid|php-src/ext/sybase_ct,php-src/NEWS avail|tommay,vvtk|php-src/ext/sysvsem avail|nyenyon,vvtk|php-src/ext/sysvshm avail|vvtk|php-src/ext/sysvipc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
On Sat, Nov 8, 2008 at 2:59 PM, Timm Friebe [EMAIL PROTECTED] wrote: Hi, - MFB: Changed while loop in php_sybase_fetch_result_row() to also read rows with retcode == CS_ROW_FAIL. # Reported by Detlef Neumerkel and Frank Irnich of Sybase Thanks for this commit :) Please add the NEWS entry as well. Tried so: $ cvs ci -m '- Added notes in fixes to ext/sybase_ct' NEWS COMMITINFO /repository/php-src NEWS Access denied: insufficient karma (thekid|php-src) Contact [EMAIL PROTECTED] for access to php-src cvs commit: Pre-commit check failed cvs [commit aborted]: correct above errors first! Could someone w/ sufficient karma commit add these lines to PHP_5_3/NEWS: You have karma for NEWS now :) Thanks again for giving sybase_ct some love :) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
On 08.11.2008 15:24, Timm Friebe wrote: thekidSat Nov 8 12:24:52 2008 UTC - php_error_docref(NULL TSRMLS_CC, E_NOTICE, cannot use non-storing mode with buffered queries); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, Sybase: Cannot use non-storing mode with buffered queries); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase: No connection to close); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase: No connection); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, called without first fetching all rows from a previous unbuffered query); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, Sybase: Called without first fetching all rows from a previous unbuffered query); What's the point in that Sybase prefix? We don't have Oracle: invalid connection or MySQL: broken query errors and they seem quite pointless to me, taking into account that they come along with the function names, which already contain that sybase_ or mysql_ prefix. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests test_unbuffered_no_full_fetch.phpt
thekid Sat Nov 8 13:21:01 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/sybase_ct/teststest_unbuffered_no_full_fetch.phpt Log: - Initial release http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt?view=markuprev=1.1 Index: php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt +++ php-src/ext/sybase_ct/tests/test_unbuffered_no_full_fetch.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests bug30312.phpt
thekid Sat Nov 8 13:21:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/testsbug30312.phpt
Log:
- Made this test independent of date format
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug30312.phpt?r1=1.1.4.1r2=1.1.4.1.2.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug30312.phpt
diff -u php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.1
php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.1.2.1
--- php-src/ext/sybase_ct/tests/bug30312.phpt:1.1.4.1 Wed Mar 14 11:46:06 2007
+++ php-src/ext/sybase_ct/tests/bug30312.phpt Sat Nov 8 13:21:30 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug30312.phpt,v 1.1.4.1 2007/03/14 11:46:06 thekid Exp $
+ * $Id: bug30312.phpt,v 1.1.4.1.2.1 2008/11/08 13:21:30 thekid Exp $
*/
require('test.inc');
@@ -14,14 +14,14 @@
$db= sybase_connect_ex();
- $query= sybase_unbuffered_query('select getdate()');
+ $query= sybase_unbuffered_query('select datepart(yy, getdate())');
$array= sybase_fetch_array($query);
var_dump($array[0]);
- $query= sybase_unbuffered_query('select getdate()');
+ $query= sybase_unbuffered_query('select datepart(yy, getdate())');
$array= sybase_fetch_array($query);
var_dump($array[0]);
?
--EXPECTF--
-string(%d) %s %d %d %d:%d%s
-string(%d) %s %d %d %d:%d%s
+int(%d)
+int(%d)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
hi,
If it fixes a crash, please merge to 5.2. And also add a NEWS entry.
I wonder if you read you @php.net alias... :)
On Sat, Nov 8, 2008 at 2:22 PM, Timm Friebe [EMAIL PROTECTED] wrote:
thekid Sat Nov 8 13:22:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- Fixed problems with segmentation faults when using unbuffered queries
# Double-freeing results caused these
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.10r2=1.103.2.5.2.13.2.11diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.10
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.11
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.10 Sat Nov 8
12:24:52 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 13:22:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.10 2008/11/08 12:24:52 thekid Exp
$ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.11 2008/11/08 13:22:14 thekid Exp
$ */
#ifdef HAVE_CONFIG_H
@@ -273,6 +273,21 @@
#define efree_n(x) { efree(x); x = NULL; }
#define efree_if(x) if (x) efree_n(x)
+#ifdef PHP_SYBASE_DEBUG
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ fprintf(stderr, _free_sybase_result(%p) called from line #%d\n,
result, __LINE__); \
+ fflush(stderr);
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#else
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#endif
static void _free_sybase_result(sybase_result *result)
{
int i, j;
@@ -326,7 +341,7 @@
php_sybase_finish_results(result TSRMLS_CC);
}
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
}
static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -1166,8 +1181,6 @@
case CS_CANCELED:
default:
- _free_sybase_result(result);
- result = NULL;
retcode = CS_FAIL;
break;
}
@@ -1273,7 +1286,7 @@
break;
default:
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
result = NULL;
retcode = CS_FAIL; /* Just to be sure */
break;
@@ -1463,17 +1476,9 @@
INIT_PZVAL(tmp);
ZEND_FETCH_RESOURCE(result, sybase_result *, tmp, -1, Sybase
result, le_result);
- /* Causes the following segfault:
- Program received signal SIGSEGV, Segmentation fault.
- 0x8144380 in _efree (ptr=0x81fe024,
__zend_filename=0x81841a0 php4/ext/sybase_ct/php_sybase_ct.c,
- __zend_lineno=946, __zend_orig_filename=0x0,
__zend_orig_lineno=0) at php4/Zend/zend_alloc.c:229
- php4/Zend/zend_alloc.c:229:7284:beg:0x8144380
- */
- #if O_TIMM
if (result) {
php_sybase_finish_results(result TSRMLS_CC);
}
- #endif
zval_ptr_dtor(tmp);
zend_list_delete(sybase_ptr-active_result_index);
@@ -1628,9 +1633,7 @@
/* Retry deadlocks up until deadlock_retry_count times */
if (sybase_ptr-deadlock SybCtG(deadlock_retry_count) != -1
++deadlock_count SybCtG(deadlock_retry_count)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Retried deadlock %d times [max: %ld], giving up, deadlock_count- 1,
SybCtG(deadlock_retry_count));
- if (result != NULL) {
- _free_sybase_result(result);
- }
+ FREE_SYBASE_RESULT(result);
break;
}
@@ -1649,9 +1652,7 @@
* optimization, we could try not to fetch results in known
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests bug29064.phpt
thekid Sat Nov 8 13:32:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/testsbug29064.phpt
Log:
- Adjusted tests to reality
# We select 123456789.12345679, we should have this returned and not
# something 123456789.123457 (rounded)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug29064.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug29064.phpt
diff -u php-src/ext/sybase_ct/tests/bug29064.phpt:1.1
php-src/ext/sybase_ct/tests/bug29064.phpt:1.1.8.1
--- php-src/ext/sybase_ct/tests/bug29064.phpt:1.1 Sun Jul 11 16:57:24 2004
+++ php-src/ext/sybase_ct/tests/bug29064.phpt Sat Nov 8 13:32:29 2008
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug29064.phpt,v 1.1 2004/07/11 16:57:24 thekid Exp $
+ * $Id: bug29064.phpt,v 1.1.8.1 2008/11/08 13:32:29 thekid Exp $
*/
require('test.inc');
@@ -112,9 +112,9 @@
[test_tinyint]=
int(123)
[test_real]=
-string(16) 123456789.123457
+string(18) 123456789.12345679
[test_double]=
-string(16) 123456789.123457
+string(18) 123456789.12345679
}
[1]=
array(10) {
@@ -135,9 +135,9 @@
[test_tinyint]=
int(255)
[test_real]=
-string(17) -123456789.123457
+string(19) -123456789.12345679
[test_double]=
-string(17) -123456789.123457
+string(19) -123456789.12345679
}
}
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
Hi, If it fixes a crash, please merge to 5.2. Merged. - Timm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests skipif.inc
felipe Sat Nov 8 15:39:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/testsskipif.inc
Log:
- MFH: Added connection checking on SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/skipif.inc?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/skipif.inc
diff -u php-src/ext/sybase_ct/tests/skipif.inc:1.2
php-src/ext/sybase_ct/tests/skipif.inc:1.2.6.1
--- php-src/ext/sybase_ct/tests/skipif.inc:1.2 Mon Nov 22 15:15:50 2004
+++ php-src/ext/sybase_ct/tests/skipif.inc Sat Nov 8 15:39:01 2008
@@ -1,8 +1,13 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: skipif.inc,v 1.2 2004/11/22 15:15:50 dmitry Exp $
+ * $Id: skipif.inc,v 1.2.6.1 2008/11/08 15:39:01 felipe Exp $
*/
+ require 'test.inc';
+
if (!extension_loaded('sybase_ct')) die('skip Sybase-CT extension not
loaded');
+
+ sybase_min_server_severity(11);
+ if ([EMAIL PROTECTED](HOST, USER, PASSWORD)) die('skip Unable to connect');
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests skipif.inc
felipe Sat Nov 8 15:39:32 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/testsskipif.inc
Log:
- MFH: Added connection checking on SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/skipif.inc?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/skipif.inc
diff -u php-src/ext/sybase_ct/tests/skipif.inc:1.2
php-src/ext/sybase_ct/tests/skipif.inc:1.2.4.1
--- php-src/ext/sybase_ct/tests/skipif.inc:1.2 Mon Nov 22 15:15:50 2004
+++ php-src/ext/sybase_ct/tests/skipif.inc Sat Nov 8 15:39:32 2008
@@ -1,8 +1,13 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: skipif.inc,v 1.2 2004/11/22 15:15:50 dmitry Exp $
+ * $Id: skipif.inc,v 1.2.4.1 2008/11/08 15:39:32 felipe Exp $
*/
+ require 'test.inc';
+
if (!extension_loaded('sybase_ct')) die('skip Sybase-CT extension not
loaded');
+
+ sybase_min_server_severity(11);
+ if ([EMAIL PROTECTED](HOST, USER, PASSWORD)) die('skip Unable to connect');
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests skipif.inc
felipe Sat Nov 8 15:38:33 2008 UTC
Modified files:
/php-src/ext/sybase_ct/testsskipif.inc
Log:
- Added connection checking on SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/skipif.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/sybase_ct/tests/skipif.inc
diff -u php-src/ext/sybase_ct/tests/skipif.inc:1.2
php-src/ext/sybase_ct/tests/skipif.inc:1.3
--- php-src/ext/sybase_ct/tests/skipif.inc:1.2 Mon Nov 22 15:15:50 2004
+++ php-src/ext/sybase_ct/tests/skipif.inc Sat Nov 8 15:38:33 2008
@@ -1,8 +1,13 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: skipif.inc,v 1.2 2004/11/22 15:15:50 dmitry Exp $
+ * $Id: skipif.inc,v 1.3 2008/11/08 15:38:33 felipe Exp $
*/
+ require 'test.inc';
+
if (!extension_loaded('sybase_ct')) die('skip Sybase-CT extension not
loaded');
+
+ sybase_min_server_severity(11);
+ if ([EMAIL PROTECTED](HOST, USER, PASSWORD)) die('skip Unable to connect');
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
Hi, If it fixes a crash, please merge to 5.2. And also add a NEWS entry. Will do as soon as I'm able to compile PHP_5_2: F:\cygwin\home\Timm Friebe\devel\php\php_5_2nmake Microsoft (R) Program Maintenance Utility Version 8.00.50727.762 Copyright (C) Microsoft Corporation. All rights reserved. \cygwin\bin\flex.exe -i -SZend/flex.skl -Pzend -oZend/zend_language_scan ner.c Zend/zend_language_scanner.l flex: fatal internal error, bad line in skeleton file NMAKE : fatal error U1077: '\cygwin\bin\flex.exe' : return code '0x1' Stop. I wonder if you read you @php.net alias... :) Hrm, I probably missed your e-mail due to the immense ammounts of SPAM I get. - Timm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
thekid Sat Nov 8 12:05:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- Changed while loop in php_sybase_fetch_result_row() to also read rows with
retcode == CS_ROW_FAIL.
# Reported by Detlef Neumerkel and Frank Irnich of Sybase
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.13.2.8r2=1.103.2.5.2.13.2.9diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.8
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.9
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.13.2.8Sun Nov 2
21:19:38 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 12:05:46 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.8 2008/11/02 21:19:38 felipe Exp $
*/
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.13.2.9 2008/11/08 12:05:46 thekid Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1200,7 +1200,7 @@
}
if (numrows!=-1) numrows+= result-num_rows;
- while ((retcode=ct_fetch(result-sybase_ptr-cmd, CS_UNUSED, CS_UNUSED,
CS_UNUSED, NULL))==CS_SUCCEED) {
+ while ((retcode=ct_fetch(result-sybase_ptr-cmd, CS_UNUSED, CS_UNUSED,
CS_UNUSED, NULL))==CS_SUCCEED || retcode == CS_ROW_FAIL) {
result-num_rows++;
i= result-store ? result-num_rows- 1 : 0;
if (i = result-blocks_initialized*SYBASE_ROWS_BLOCK) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
thekid Sat Nov 8 12:06:08 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- MFB: Changed while loop in php_sybase_fetch_result_row() to also read rows
with
retcode == CS_ROW_FAIL.
# Reported by Detlef Neumerkel and Frank Irnich of Sybase
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.14r2=1.103.2.5.2.15diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.14
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.15
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.14Mon Dec 31
07:20:13 2007
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 12:06:08 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.14 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.15 2008/11/08 12:06:08 thekid Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1143,7 +1143,7 @@
}
if (numrows!=-1) numrows+= result-num_rows;
- while ((retcode=ct_fetch(result-sybase_ptr-cmd, CS_UNUSED, CS_UNUSED,
CS_UNUSED, NULL))==CS_SUCCEED) {
+ while ((retcode=ct_fetch(result-sybase_ptr-cmd, CS_UNUSED, CS_UNUSED,
CS_UNUSED, NULL))==CS_SUCCEED || retcode == CS_ROW_FAIL) {
result-num_rows++;
i= result-store ? result-num_rows- 1 : 0;
if (i = result-blocks_initialized*SYBASE_ROWS_BLOCK) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct php_sybase_ct.c
thekid Sat Nov 8 14:15:09 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
- MFB: Fixed problems with segmentation faults when using unbuffered queries
# Double-freeing results caused these
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103.2.5.2.15r2=1.103.2.5.2.16diff_format=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.15
php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.16
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.103.2.5.2.15Sat Nov 8
12:06:08 2008
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Nov 8 14:15:08 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.103.2.5.2.15 2008/11/08 12:06:08 thekid Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103.2.5.2.16 2008/11/08 14:15:08 thekid Exp $ */
#ifdef HAVE_CONFIG_H
@@ -138,6 +138,21 @@
#define efree_n(x) { efree(x); x = NULL; }
#define efree_if(x) if (x) efree_n(x)
+#ifdef PHP_SYBASE_DEBUG
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ fprintf(stderr, _free_sybase_result(%p) called from line #%d\n,
result, __LINE__); \
+ fflush(stderr);
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#else
+#define FREE_SYBASE_RESULT(result)
\
+ if (result) {
\
+ _free_sybase_result(result);
\
+ result = NULL;
\
+ }
+#endif
static void _free_sybase_result(sybase_result *result)
{
int i, j;
@@ -191,7 +206,7 @@
php_sybase_finish_results(result TSRMLS_CC);
}
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
}
static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
@@ -1109,8 +1124,6 @@
case CS_CANCELED:
default:
- _free_sybase_result(result);
- result = NULL;
retcode = CS_FAIL;
break;
}
@@ -1216,7 +1229,7 @@
break;
default:
- _free_sybase_result(result);
+ FREE_SYBASE_RESULT(result);
result = NULL;
retcode = CS_FAIL; /* Just to be sure */
break;
@@ -1425,17 +1438,9 @@
INIT_PZVAL(tmp);
ZEND_FETCH_RESOURCE(result, sybase_result *, tmp, -1, Sybase
result, le_result);
- /* Causes the following segfault:
- Program received signal SIGSEGV, Segmentation fault.
- 0x8144380 in _efree (ptr=0x81fe024,
__zend_filename=0x81841a0 php4/ext/sybase_ct/php_sybase_ct.c,
- __zend_lineno=946, __zend_orig_filename=0x0,
__zend_orig_lineno=0) at php4/Zend/zend_alloc.c:229
- php4/Zend/zend_alloc.c:229:7284:beg:0x8144380
- */
- #if O_TIMM
if (result) {
php_sybase_finish_results(result TSRMLS_CC);
}
- #endif
zval_ptr_dtor(tmp);
zend_list_delete(sybase_ptr-active_result_index);
@@ -1590,9 +1595,7 @@
/* Retry deadlocks up until deadlock_retry_count times */
if (sybase_ptr-deadlock SybCtG(deadlock_retry_count) != -1
++deadlock_count SybCtG(deadlock_retry_count)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Sybase:
Retried deadlock %d times [max: %ld], giving up, deadlock_count- 1,
SybCtG(deadlock_retry_count));
- if (result != NULL) {
- _free_sybase_result(result);
- }
+ FREE_SYBASE_RESULT(result);
break;
}
@@ -1611,9 +1614,7 @@
* optimization, we could try not to fetch results in known
* deadlock conditions, but deadlock is (should be) rare.
*/
- if (result != NULL) {
- _free_sybase_result(result);
- }
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct/tests test.inc
thekid Sat Nov 8 11:47:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sybase_ct/teststest.inc
Log:
- Changed source to read host, user and password from environment
# E.g. nmake test TESTS=ext/sybase_ct PHP_SYBASE_HOST=db PHP_SYBASE_USER=sa
PHP_SYBASE_PASS=***
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.4.6.3r2=1.4.6.3.2.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test.inc
diff -u php-src/ext/sybase_ct/tests/test.inc:1.4.6.3
php-src/ext/sybase_ct/tests/test.inc:1.4.6.3.2.1
--- php-src/ext/sybase_ct/tests/test.inc:1.4.6.3Tue May 22 11:36:55 2007
+++ php-src/ext/sybase_ct/tests/test.incSat Nov 8 11:47:35 2008
@@ -1,13 +1,13 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test.inc,v 1.4.6.3 2007/05/22 11:36:55 thekid Exp $
+ * $Id: test.inc,v 1.4.6.3.2.1 2008/11/08 11:47:35 thekid Exp $
*/
// Change if needed
- define('HOST', '');
- define('USER', '');
- define('PASSWORD', '');
+ define('HOST', getenv('PHP_SYBASE_HOST'));
+ define('USER', getenv('PHP_SYBASE_USER'));
+ define('PASSWORD', getenv('PHP_SYBASE_PASS'));
define('TEMPDB', 'tempdb');
// {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int
line, string text)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
Hi,
What's the point in that Sybase prefix?
We don't have Oracle: invalid connection or MySQL: broken query errors
and they seem quite pointless to me, taking into account that they come
along with the function names, which already contain that sybase_ or
mysql_ prefix.
Yes, they're stupid and annoying, and I'd remove them if I didn't know that
people rely on this like in preg_match('/Sybase: /', $php_errormsg) - so I
decided to keep it until now (and to be consistent inside the extension to
have it everywhere).
What do the both of you think? Drop it and include a note in NEWS?
- Timm
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
Pierre Joye kirjoitti: On Sat, Nov 8, 2008 at 2:39 PM, Timm Friebe [EMAIL PROTECTED] wrote: Hi, If it fixes a crash, please merge to 5.2. And also add a NEWS entry. Will do as soon as I'm able to compile PHP_5_2: F:\cygwin\home\Timm Friebe\devel\php\php_5_2nmake Microsoft (R) Program Maintenance Utility Version 8.00.50727.762 Copyright (C) Microsoft Corporation. All rights reserved. \cygwin\bin\flex.exe -i -SZend/flex.skl -Pzend -oZend/zend_language_scan ner.c Zend/zend_language_scanner.l flex: fatal internal error, bad line in skeleton file NMAKE : fatal error U1077: '\cygwin\bin\flex.exe' : return code '0x1' Stop. http://pecl2.php.net/downloads/php-windows-builds/php-libs/binary-tools.zip contains the version we use for all bins (re2c, flex, bison, etc.). I wonder if you read you @php.net alias... :) Hrm, I probably missed your e-mail due to the immense ammounts of SPAM I get. :( I also tried to contact you before IPC (about sybase). Cheers, Pierre, you don't seem to read your @php.net (or any other) boxes either, so stfu and stop acting like some fucking project manager here! --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
On Sat, Nov 8, 2008 at 6:52 PM, Jani Taskinen [EMAIL PROTECTED] wrote: Pierre, you don't seem to read your @php.net (or any other) boxes either, so stfu and stop acting like some fucking project manager here! Thanks for the constructive, useful and sensible comment, enjoy your weekend! -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 20:21:14 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
functionalize running commands, code formatting, special-case php-src to copy
TSRM/ZendEngine2, make systems repo
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.20r2=1.21diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.20 SVNROOT/run-conversion.php:1.21
--- SVNROOT/run-conversion.php:1.20 Sat Nov 8 06:07:24 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 20:21:14 2008
@@ -6,7 +6,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.20 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.21 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -57,6 +57,17 @@
return array_filter($results, 'scandir_is_meta');
}
+function run_command($command)
+{
+v(2, Running '{$command}'...);
+exec($command, $output, $exitstatus);
+if ($exitstatus != 0) {
+error(\nAn error occurred. Exit status was {$exitstatus}. Output:\n
. implode(\n, $output) . \n);
+}
+v(2, done.\n);
+return $output;
+}
+
//
-
// Commandline options
$cmdline_parser = new Console_CommandLine(array(
@@ -163,7 +174,8 @@
$modprefix = $moduleName . '/';
foreach(scandir_no_meta($cvspath) as $module) {
if (!is_dir($cvspath . $module) ||
-count(scandir($cvspath . $module)) == 2 || $module ==
'Attic' || ($moduleName == 'pecl' $module == 'libextractor') ||
+count(scandir($cvspath . $module)) == 2 || $module ==
'Attic' ||
+($moduleName == 'pecl' $module == 'libextractor') ||
($moduleName == 'pear' in_array($module,
array('HTML_QuickForm_ComboBox', 'Services_Compete', 'XML_HTMLSax3' {
continue; // empty dir
}
@@ -180,6 +192,22 @@
EOEXTRA;
}
} else {
+if ($moduleName == 'php-src') {
+// We special-case php-src so we can move TSRM and ZendEngine2
into it easily. Ugh.
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') .
+
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
+ ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+run_command($command);
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') .
+
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
+ ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+run_command($command);
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
+
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
+ ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+run_command($command);
+$cvspath = $GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src';
+}
$this-optionsFileContents .= EOEXTRA
run_options.add_project(
'{$cvspath}',
@@ -273,12 +301,7 @@
}
$command = exec svnadmin create .
escapeshellarg($this-svnRepositoryPath) . 21;
v(1, Creating SVN repository for '{$this-repositoryName}' in
{$this-svnRepositoryPath}...\n);
-v(2, Running: '{$command}'...);
-exec($command, $output, $exitstatus);
-if ($exitstatus != 0) {
-error(\nAn error occurred. Exit status was {$exitstatus}.
Output:\n . implode(\n, $output) . \n, $exitstatus);
-}
-v(2, done.\n);
+run_command($command);
}
public function importCVSModules()
@@ -287,7 +310,7 @@
error(SVN repository at {$this-svnRepositoryPath} doesn't exist
or isn't writable.\n);
}
-if (trim(system('svnlook youngest ' .
escapeshellarg($this-svnRepositoryPath))) != 0) {
+if (trim(end(run_command('svnlook youngest ' .
escapeshellarg($this-svnRepositoryPath != 0) {
return; // Repo isn't empty
}
@@ -303,13 +326,7 @@
private function executeSVNCommand($cmd)
{
$realCommand = exec svn {$cmd}
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sybase_ct php_sybase_ct.c
On 08.11.2008 16:37, Timm Friebe wrote:
Yes, they're stupid and annoying, and I'd remove them if I didn't know that
people rely on this like in preg_match('/Sybase: /', $php_errormsg) - so I
decided to keep it until now (and to be consistent inside the extension to
have it everywhere).
What do the both of you think? Drop it and include a note in NEWS?
Yes, drop it pls.
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:25:48 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
cp needs spaces between parameters... and end() needs a reference
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.21r2=1.22diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.21 SVNROOT/run-conversion.php:1.22
--- SVNROOT/run-conversion.php:1.21 Sat Nov 8 20:21:14 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:25:48 2008
@@ -6,7 +6,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.21 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.22 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -194,15 +194,15 @@
} else {
if ($moduleName == 'php-src') {
// We special-case php-src so we can move TSRM and ZendEngine2
into it easily. Ugh.
-$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') .
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
-$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') .
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
-$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
@@ -310,7 +310,8 @@
error(SVN repository at {$this-svnRepositoryPath} doesn't exist
or isn't writable.\n);
}
-if (trim(end(run_command('svnlook youngest ' .
escapeshellarg($this-svnRepositoryPath != 0) {
+$output = run_command('svnlook youngest ' .
escapeshellarg($this-svnRepositoryPath));
+if (trim(end($output)) != 0) {
return; // Repo isn't empty
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:30:35 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
fake CVS repo for the php-src temp dir
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.22r2=1.23diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.22 SVNROOT/run-conversion.php:1.23
--- SVNROOT/run-conversion.php:1.22 Sat Nov 8 22:25:48 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:30:35 2008
@@ -6,7 +6,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.22 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.23 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -206,6 +206,7 @@
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
+run_command('exec cvs init ' .
escapeshellarg($GLOBALS['temp_path']));
$cvspath = $GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src';
}
$this-optionsFileContents .= EOEXTRA
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:31:55 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
use cvs init correctly
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.23r2=1.24diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.23 SVNROOT/run-conversion.php:1.24
--- SVNROOT/run-conversion.php:1.23 Sat Nov 8 22:30:35 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:31:55 2008
@@ -6,7 +6,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.23 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.24 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -206,7 +206,7 @@
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
-run_command('exec cvs init ' .
escapeshellarg($GLOBALS['temp_path']));
+run_command('exec cvs -d' .
escapeshellarg($GLOBALS['temp_path']) . ' init');
$cvspath = $GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src';
}
$this-optionsFileContents .= EOEXTRA
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:36:09 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
we need the real CVSROOT for this
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.24r2=1.25diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.24 SVNROOT/run-conversion.php:1.25
--- SVNROOT/run-conversion.php:1.24 Sat Nov 8 22:31:55 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:36:09 2008
@@ -1,12 +1,13 @@
?php
//
-
-// Error level
+// Settings
error_reporting(E_ALL | E_STRICT);
+date_default_timezone_set('UTC');
//
-
// Constants
-$version = substr('$Revision: 1.24 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.25 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -199,14 +200,17 @@
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') . ' ' .
-
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
+
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
' ' .
-
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src/') .
+
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
+ ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+run_command($command);
+$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'CVSROOT') . ' ' .
+
escapeshellarg($GLOBALS['temp_path']) .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
-run_command('exec cvs -d' .
escapeshellarg($GLOBALS['temp_path']) . ' init');
$cvspath = $GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src';
}
$this-optionsFileContents .= EOEXTRA
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:44:45 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
redirect error output from cp, ignore permission errors in CVSROOT copy
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.25r2=1.26diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.25 SVNROOT/run-conversion.php:1.26
--- SVNROOT/run-conversion.php:1.25 Sat Nov 8 22:36:09 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:44:45 2008
@@ -7,7 +7,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.25 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.26 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -58,14 +58,17 @@
return array_filter($results, 'scandir_is_meta');
}
-function run_command($command)
+function run_command($command, $ignoreErrors = TRUE)
{
v(2, Running '{$command}'...);
exec($command, $output, $exitstatus);
-if ($exitstatus != 0) {
+if ($exitstatus != 0 !$ignoreErrors) {
error(\nAn error occurred. Exit status was {$exitstatus}. Output:\n
. implode(\n, $output) . \n);
+} else if ($exitStatus != 0) {
+v(2, warning: an error occurred.\n);
+} else {
+v(2, done.\n);
}
-v(2, done.\n);
return $output;
}
@@ -197,20 +200,20 @@
// We special-case php-src so we can move TSRM and ZendEngine2
into it easily. Ugh.
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'php-src') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
- ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+ ' 21 ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'ZendEngine2') . ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
- ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+ ' 21 ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR . 'TSRM') .
' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'php-src') .
- ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+ ' 21 ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
run_command($command);
$command = 'exec cp -Rpv ' .
escapeshellarg($GLOBALS['options']['cvsroot'] . DIRECTORY_SEPARATOR .
'CVSROOT') . ' ' .
escapeshellarg($GLOBALS['temp_path']) .
- ' ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
-run_command($command);
+ ' 21 ' .
escapeshellarg($GLOBALS['temp_path'] . DIRECTORY_SEPARATOR . 'cp-output');
+run_command($command, TRUE);
$cvspath = $GLOBALS['temp_path'] . DIRECTORY_SEPARATOR .
'php-src';
}
$this-optionsFileContents .= EOEXTRA
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c
rasmus Sat Nov 8 22:45:29 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
Potential fix for bug #46525
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.64r2=1.267.2.15.2.65diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.64
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.65
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.64 Mon Nov 3 23:26:23 2008
+++ php-src/sapi/cgi/cgi_main.c Sat Nov 8 22:45:29 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.64 2008/11/03 23:26:23 lbarnaud Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.65 2008/11/08 22:45:29 rasmus Exp $ */
#include php.h
#include php_globals.h
@@ -447,6 +447,7 @@
}
} else if (response_status == 304 h-header_len
sizeof(Content-Type:)-1
strncasecmp(h-header, Content-Type:,
sizeof(Content-Type:)-1) == 0) {
+ h =
(sapi_header_struct*)zend_llist_get_next_ex(sapi_headers-headers, pos);
continue;
} else {
PHPWRITE_H(h-header, h-header_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sat Nov 8 22:46:58 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
typo
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.26r2=1.27diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.26 SVNROOT/run-conversion.php:1.27
--- SVNROOT/run-conversion.php:1.26 Sat Nov 8 22:44:45 2008
+++ SVNROOT/run-conversion.php Sat Nov 8 22:46:57 2008
@@ -7,7 +7,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.26 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.27 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -64,7 +64,7 @@
exec($command, $output, $exitstatus);
if ($exitstatus != 0 !$ignoreErrors) {
error(\nAn error occurred. Exit status was {$exitstatus}. Output:\n
. implode(\n, $output) . \n);
-} else if ($exitStatus != 0) {
+} else if ($exitstatus != 0) {
v(2, warning: an error occurred.\n);
} else {
v(2, done.\n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c
rasmus Sat Nov 8 22:56:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
Fix for bug #46525
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.30r2=1.267.2.15.2.50.2.31diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.30
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.31
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.30Tue Oct 21 03:19:28 2008
+++ php-src/sapi/cgi/cgi_main.c Sat Nov 8 22:56:17 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.30 2008/10/21 03:19:28 lbarnaud Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.31 2008/11/08 22:56:17 rasmus Exp $ */
#include php.h
#include php_globals.h
@@ -454,6 +454,7 @@
}
} else if (response_status == 304 h-header_len
sizeof(Content-Type:)-1
strncasecmp(h-header, Content-Type:,
sizeof(Content-Type:)-1) == 0) {
+ h =
(sapi_header_struct*)zend_llist_get_next_ex(sapi_headers-headers, pos);
continue;
} else {
PHPWRITE_H(h-header, h-header_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sun Nov 9 06:00:55 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
default to false, not true...
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.27r2=1.28diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.27 SVNROOT/run-conversion.php:1.28
--- SVNROOT/run-conversion.php:1.27 Sat Nov 8 22:46:57 2008
+++ SVNROOT/run-conversion.php Sun Nov 9 06:00:55 2008
@@ -7,7 +7,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.27 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.28 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -58,7 +58,7 @@
return array_filter($results, 'scandir_is_meta');
}
-function run_command($command, $ignoreErrors = TRUE)
+function run_command($command, $ignoreErrors = FALSE)
{
v(2, Running '{$command}'...);
exec($command, $output, $exitstatus);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / phpsvn.options.skel run-conversion.php
gwynne Sun Nov 9 06:37:09 2008 UTC
Modified files:
/SVNROOTphpsvn.options.skel run-conversion.php
Log:
fix keywords, remove obsolete fixup rules
http://cvs.php.net/viewvc.cgi/SVNROOT/phpsvn.options.skel?r1=1.1r2=1.2diff_format=u
Index: SVNROOT/phpsvn.options.skel
diff -u SVNROOT/phpsvn.options.skel:1.1 SVNROOT/phpsvn.options.skel:1.2
--- SVNROOT/phpsvn.options.skel:1.1 Wed Nov 5 18:15:59 2008
+++ SVNROOT/phpsvn.options.skel Sun Nov 9 06:37:09 2008
@@ -64,9 +64,9 @@
CVSBinaryFileEOLStyleSetter(),
CVSBinaryFileDefaultMimeTypeSetter(),
EOLStyleFromMimeTypeSetter(),
-DefaultEOLStyleSetter('native'),
+DefaultEOLStyleSetter(r'native'),
SVNBinaryFileKeywordsPropertySetter(),
-KeywordsPropertySetter(config.SVN_KEYWORDS_VALUE),
+KeywordsPropertySetter(r'Id Rev Revision Date LastChangedDate
LastChangedRevision Author LastChangedBy HeadURL URL'),
ExecutablePropertySetter(),
CVSRevisionNumberSetter(),
])
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.28r2=1.29diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.28 SVNROOT/run-conversion.php:1.29
--- SVNROOT/run-conversion.php:1.28 Sun Nov 9 06:00:55 2008
+++ SVNROOT/run-conversion.php Sun Nov 9 06:37:09 2008
@@ -7,7 +7,7 @@
//
-
// Constants
-$version = substr('$Revision: 1.28 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.29 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -463,12 +463,6 @@
$repoList['doc']-addRenameRule(array('mode' = 'move', 'srcPath' =
'phpdoc', 'dstPath' = 'doc-base'));
// Fixup rules for php-src
$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'pdo-specs/trunk', 'dstPath' = 'php-src/trunk/ext/pdo/specs'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'ZendEngine2/trunk', 'dstPath' = 'php-src/trunk/ZendEngine2'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'ZendEngine2/branches/PHP_5_2', 'dstPath' =
'php-src/branches/PHP_5_2/ZendEngine2'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'ZendEngine2/branches/PHP_5_3', 'dstPath' =
'php-src/branches/PHP_5_3/ZendEngine2'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'TSRM/trunk', 'dstPath' = 'php-src/trunk/TSRM'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'TSRM/branches/PHP_5_2', 'dstPath' = 'php-src/branches/PHP_5_2/TSRM'));
-$repoList['src']-addRenameRule(array('mode' = 'move', 'srcPath' =
'TSRM/branches/PHP_5_3', 'dstPath' = 'php-src/branches/PHP_5_3/TSRM'));
// Fixup rules for pear1
$repoList['pear1']-addRenameRule(array('mode' = 'delete', 'srcPath' =
'pear/Selenium/branches/shin/.svn'));
$repoList['pear1']-addRenameRule(array('mode' = 'delete', 'srcPath' =
'pear/Selenium/branches/shin/tests/.svn'));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
