[PHP-CVS] cvs: php-src /win32/build Makefile confutils.js

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 18:23:06 2005 EDT

  Modified files:  
/php-src/win32/buildMakefile confutils.js 
  Log:
  even less noise
  
  
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.28&r2=1.29&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.28 php-src/win32/build/Makefile:1.29
--- php-src/win32/build/Makefile:1.28   Fri Jan 21 22:36:38 2005
+++ php-src/win32/build/MakefileSun Feb  6 18:23:05 2005
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <[EMAIL PROTECTED]>   |
 #  +--+
 #
-# $Id: Makefile,v 1.28 2005/01/22 03:36:38 edink Exp $
+# $Id: Makefile,v 1.29 2005/02/06 23:23:05 wez Exp $
 # This is the makefile template for the win32 build
 
 CC="$(CL)"
@@ -65,7 +65,7 @@
win32\build\template.rc 
 
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) 
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
-   $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) 
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) 
$(LIBS) $(PHPDLL_RES)
+   @$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) 
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) 
$(LIBS) $(PHPDLL_RES)

 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)

http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.52&r2=1.53&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.52 
php-src/win32/build/confutils.js:1.53
--- php-src/win32/build/confutils.js:1.52   Sun Feb  6 17:48:35 2005
+++ php-src/win32/build/confutils.jsSun Feb  6 18:23:05 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.52 2005/02/06 22:48:35 wez Exp $
+// $Id: confutils.js,v 1.53 2005/02/06 23:23:05 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -870,7 +870,7 @@
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
-   var ld = "$(LD)";
+   var ld = "@$(LD)";
 
STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname);
 
@@ -1010,7 +1010,7 @@
var libname = dllname.substring(0, dllname.length-4) + ".lib";
 
var resname = generate_version_info_resource(dllname, 
configure_module_dirname);
-   var ld = "$(LD)";
+   var ld = "@$(LD)";
 
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" + 
libname + ": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) 
$(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + " 
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) 
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname);

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



[PHP-CVS] cvs: php-src /main php_streams.h

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 18:17:10 2005 EDT

  Modified files:  
/php-src/main   php_streams.h 
  Log:
  Avoid bug where stream_copy_to_stream() call for precisely 200 bytes would
  result in entire resource being copied.
  The mmap brake is already present inside mmap_range() and is set to 1MB.
  
  
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.99&r2=1.100&ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.99 php-src/main/php_streams.h:1.100
--- php-src/main/php_streams.h:1.99 Mon Nov 15 18:43:12 2004
+++ php-src/main/php_streams.h  Sun Feb  6 18:17:09 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_streams.h,v 1.99 2004/11/15 23:43:12 iliaa Exp $ */
+/* $Id: php_streams.h,v 1.100 2005/02/06 23:17:09 wez Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -407,10 +407,8 @@
 #define PHP_STREAM_OPTION_RETURN_NOTIMPL   -2 /* underlying stream does 
not implement; streams can handle it instead */
 
 /* copy up to maxlen bytes from src to dest.  If maxlen is 
PHP_STREAM_COPY_ALL, copy until eof(src).
- * Uses mmap if the src is a plain file and at offset 0 
- * To ensure we don't take up too much memory when reading large files, set 
the default mmap length
- * at this many bytes */
-#define PHP_STREAM_COPY_ALL200
+ * Uses mmap if the src is a plain file and at offset 0 */
+#define PHP_STREAM_COPY_ALL((size_t)-1)
 
 BEGIN_EXTERN_C()
 PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, 
size_t maxlen STREAMS_DC TSRMLS_DC);

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



[PHP-CVS] cvs: php-src /ext/standard file.c

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 18:05:31 2005 EDT

  Modified files:  
/php-src/ext/standard   file.c 
  Log:
  support sucking data from streams in file_put_contents()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.395&r2=1.396&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.395 php-src/ext/standard/file.c:1.396
--- php-src/ext/standard/file.c:1.395   Sun Dec 12 18:21:53 2004
+++ php-src/ext/standard/file.c Sun Feb  6 18:05:24 2005
@@ -21,7 +21,7 @@
+--+
  */
 
-/* $Id: file.c,v 1.395 2004/12/12 23:21:53 wez Exp $ */
+/* $Id: file.c,v 1.396 2005/02/06 23:05:24 wez Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -586,6 +586,15 @@
RETURN_FALSE;
}
switch (Z_TYPE_P(data)) {
+   case IS_RESOURCE:
+   {
+   php_stream *srcstream;
+   php_stream_from_zval(srcstream, &data);
+
+   numbytes = php_stream_copy_to_stream(srcstream, stream, 
PHP_STREAM_COPY_ALL);
+
+   break;
+   }
case IS_NULL:
case IS_LONG:
case IS_DOUBLE:

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



[PHP-CVS] cvs: php-src /ext/standard exec.c

2005-02-06 Thread Ilia Alshanetsky
iliaa   Sun Feb  6 17:58:47 2005 EDT

  Modified files:  
/php-src/ext/standard   exec.c 
  Log:
  Fixed possible un-initialized var on error.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/exec.c?r1=1.111&r2=1.112&ty=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.111 php-src/ext/standard/exec.c:1.112
--- php-src/ext/standard/exec.c:1.111   Mon Jul 12 14:49:47 2004
+++ php-src/ext/standard/exec.c Sun Feb  6 17:58:46 2005
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: exec.c,v 1.111 2004/07/12 18:49:47 iliaa Exp $ */
+/* $Id: exec.c,v 1.112 2005/02/06 22:58:46 iliaa Exp $ */
 
 #include 
 #include "php.h"
@@ -66,7 +66,7 @@
php_stream *stream;
size_t buflen, bufl = 0;
 #if PHP_SIGCHILD
-   void (*sig_handler)();
+   void (*sig_handler)() = NULL;
 #endif
 
if (PG(safe_mode)) {
@@ -177,7 +177,9 @@
 
 done:
 #if PHP_SIGCHILD
-   signal (SIGCHLD, sig_handler);
+   if (sig_handler) {
+   signal(SIGCHLD, sig_handler);
+   }
 #endif
if (d) {
efree(d);

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



[PHP-CVS] cvs: php-src /win32/build confutils.js

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 17:48:37 2005 EDT

  Modified files:  
/php-src/win32/buildconfutils.js 
  Log:
  less noise
  
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.51&r2=1.52&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.51 
php-src/win32/build/confutils.js:1.52
--- php-src/win32/build/confutils.js:1.51   Wed Jan 19 22:24:50 2005
+++ php-src/win32/build/confutils.jsSun Feb  6 17:48:35 2005
@@ -17,7 +17,7 @@
   +--+
 */
 
-// $Id: confutils.js,v 1.51 2005/01/20 03:24:50 wez Exp $
+// $Id: confutils.js,v 1.52 2005/02/06 22:48:35 wez Exp $
 
 var STDOUT = WScript.StdOut;
 var STDERR = WScript.StdErr;
@@ -1130,7 +1130,7 @@
}
} else {
MFO.WriteLine(sub_build + obj + ": " + dir + "\\" + 
src);
-   MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) $(" + 
bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build + obj);
+   MFO.WriteLine("[EMAIL PROTECTED](CC) $(" + flags + ") 
$(CFLAGS) $(" + bd_flags_name + ") /c " + dir + "\\" + src + " /Fo" + sub_build 
+ obj);
}
}
 

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



[PHP-CVS] cvs: php-src /main php_memory_streams.h /main/streams memory.c

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 16:41:36 2005 EDT

  Modified files:  
/php-src/main/streams   memory.c 
/php-src/main   php_memory_streams.h 
  Log:
  add an open mode for the memory streams that allows the stream to take
  ownership of the passed-in buffer
  
  
http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.6&r2=1.7&ty=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.6 php-src/main/streams/memory.c:1.7
--- php-src/main/streams/memory.c:1.6   Thu Jan  8 03:17:59 2004
+++ php-src/main/streams/memory.c   Sun Feb  6 16:41:35 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: memory.c,v 1.6 2004/01/08 08:17:59 andi Exp $ */
+/* $Id: memory.c,v 1.7 2005/02/06 21:41:35 wez Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -237,7 +237,7 @@
if ((stream = php_stream_memory_create_rel(mode)) != NULL) {
ms = stream->abstract;

-   if (mode == TEMP_STREAM_READONLY) {
+   if (mode == TEMP_STREAM_READONLY || mode == 
TEMP_STREAM_TAKE_BUFFER) {
/* use the buffer directly */
ms->data = buf;
ms->fsize = length;
http://cvs.php.net/diff.php/php-src/main/php_memory_streams.h?r1=1.11&r2=1.12&ty=u
Index: php-src/main/php_memory_streams.h
diff -u php-src/main/php_memory_streams.h:1.11 
php-src/main/php_memory_streams.h:1.12
--- php-src/main/php_memory_streams.h:1.11  Fri Feb 20 03:04:30 2004
+++ php-src/main/php_memory_streams.h   Sun Feb  6 16:41:36 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_memory_streams.h,v 1.11 2004/02/20 08:04:30 hholzgra Exp $ */
+/* $Id: php_memory_streams.h,v 1.12 2005/02/06 21:41:36 wez Exp $ */
 
 #ifndef PHP_MEMORY_STREAM_H
 #define PHP_MEMORY_STREAM_H
@@ -27,6 +27,7 @@
 
 #define TEMP_STREAM_DEFAULT  0
 #define TEMP_STREAM_READONLY 1
+#define TEMP_STREAM_TAKE_BUFFER 2
 
 #define php_stream_memory_create(mode) _php_stream_memory_create((mode) 
STREAMS_CC TSRMLS_CC)
 #define php_stream_memory_create_rel(mode) _php_stream_memory_create((mode) 
STREAMS_REL_CC TSRMLS_CC)

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



[PHP-CVS] cvs: php-src /ext/sqlite TODO

2005-02-06 Thread Wez Furlong
wez Sun Feb  6 14:59:33 2005 EDT

  Modified files:  
/php-src/ext/sqlite TODO 
  Log:
  update todo
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/TODO?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/sqlite/TODO
diff -u php-src/ext/sqlite/TODO:1.15 php-src/ext/sqlite/TODO:1.16
--- php-src/ext/sqlite/TODO:1.15Fri Jan 16 12:50:02 2004
+++ php-src/ext/sqlite/TODO Sun Feb  6 14:59:32 2005
@@ -1,3 +1,5 @@
+- Implement a PDO driver, called sqlite2
+
 - Transparent binary encoding of return values from PHP callback functions.
 
 - Add user-space callback for the authorizer function (this is potentially
@@ -14,6 +16,4 @@
--> Our test suite doesn't allow us to test persistent connections
at this time :/
 
-- Add support for compiled SQL.
-
 vim:tw=78

-- 
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 index.php

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 09:08:12 2005 EDT

  Modified files:  
/php-src/ext/sybase_ct/testsindex.php 
  Log:
  - Made error handler not output anything if error was not in 
error_reporting() mask
  
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/index.php?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sybase_ct/tests/index.php
diff -u php-src/ext/sybase_ct/tests/index.php:1.2 
php-src/ext/sybase_ct/tests/index.php:1.3
--- php-src/ext/sybase_ct/tests/index.php:1.2   Sun Feb  6 09:06:21 2005
+++ php-src/ext/sybase_ct/tests/index.php   Sun Feb  6 09:08:11 2005
@@ -1,7 +1,7 @@
  'Warning'
   );
   
+  if (!(error_reporting() & $errno)) return;
   printf(
 "\n%s: %s in %s on line %d\n", 
 $names[$errno], 

-- 
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 index.php

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 09:06:25 2005 EDT

  Modified files:  
/php-src/ext/sybase_ct/testsindex.php 
  Log:
  - Fixed error handler for situations in which an error
was raised in an include file
  
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/index.php?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sybase_ct/tests/index.php
diff -u php-src/ext/sybase_ct/tests/index.php:1.1 
php-src/ext/sybase_ct/tests/index.php:1.2
--- php-src/ext/sybase_ct/tests/index.php:1.1   Sun Feb  6 08:35:09 2005
+++ php-src/ext/sybase_ct/tests/index.php   Sun Feb  6 09:06:21 2005
@@ -1,7 +1,7 @@
 name,
+strstr($errfile, 'eval()\'d code') ? $this->name : $errfile,
 $errline
   );
 }

-- 
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 index.php

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 08:35:10 2005 EDT

  Added files: 
/php-src/ext/sybase_ct/testsindex.php 
  Log:
  - Initial release
  # Used for being able to run .phpt-files in a webserver environment
  # Incomplete and pretty basic but serves its purpose ATM
  

http://cvs.php.net/co.php/php-src/ext/sybase_ct/tests/index.php?r=1.1&p=1
Index: php-src/ext/sybase_ct/tests/index.php
+++ php-src/ext/sybase_ct/tests/index.php
expected= $expected;
}

function matches($output) { }
  }
  // }}}

  // {{{ class PHPTRegexExpectancy
  // Expectancy class for regular expressions
  class PHPTRegexExpectancy extends PHPTExpectancy {

function matches($output) { 
  return preg_match('°^'.strtr(preg_quote(rtrim($this->expected), '°'), 
array(
'%s' => '(.+)',
'%d' => '([0-9]+)'
  )).'°', $output);
}
  }
  // }}}

  // {{{ class PHPTTest
  // Represents a single .phpt-style test
  class PHPTTest {
var
  $name = '',
  $description  = '',
  $skipif   = '',
  $code = '',
  $expectancy   = NULL,
  $output   = '';

function &fromFile($filename) {
  $fd= fopen($filename, 'r');
  
  $sections= array();
  $current= NULL;
  while (!feof($fd)) {
$line= fgets($fd, 0x);
if (1 == sscanf($line, '--%[^-]--', $section)) {
  $sections[$section]= '';
  $current= $section;
  continue;
}
$sections[$current].= $line;
  }
  fclose($fd);
  
  // Create instance from read data and return it
  $t= &new PHPTTest(); {
$t->name= substr(realpath($filename), 0, -1);
$t->description= rtrim($sections['TEST']);
$t->skipif= $sections['SKIPIF'];
$t->code= $sections['FILE'];

if (isset($sections['EXPECTF'])) {
  $t->expectancy= &new PHPTRegexExpectancy($sections['EXPECTF']);
} else {
  // XXX TBI XXX
}
  }  
  return $t;
}

function onError($errno, $errstr, $errfile, $errline) {
  static $names= array(
E_NOTICE=> 'Notice',
E_WARNING   => 'Warning'
  );
  
  printf(
"\n%s: %s in %s on line %d\n", 
$names[$errno], 
$errstr,
$this->name,
$errline
  );
}

function run() {

  // Precondition check - will die if test needs to be skipped
  eval('?>'.$this->skipif);
  
  set_error_handler(array(&$this, 'onError')); {
error_reporting(E_ALL);

ob_start();
eval('?>'.$this->code);
$this->output= rtrim(ob_get_contents());
ob_end_clean();
  } restore_error_handler();
  
  return $this->expectancy->matches($this->output);
}
  }
  // }}}
  
  // {{{ main
  if (isset($_GET['phpinfo'])) {
phpinfo((int)$_GET['phpinfo']);

echo 'Home';
exit();
  }

  echo <<<__
  

  PHPT Test
  
body {
  background-color: #ff; 
  color: #00;
  font-size: 75%;
}
body, td, th, h1, h2 {
  font-family: sans-serif;
}
h1 {
  font-size: 150%;
}
h2 {
  font-size: 125%;
}
.header {
  background: url(?=PHPE9568F34-D428-11d2-A769-00AA001ACF42);
  background-position: right center;
  background-repeat: no-repeat;
  min-height: 70px;
  background-color: #cc;
  padding: 4px;
  padding-right: 120px;
  border: 1px solid #00;
}
hr {
  width: 600px; 
  background-color: #cc; 
  border: 0px; 
  height: 1px; 
  color: #00;
}
  


__;

  $test= basename($_SERVER['QUERY_STRING']);
  if ($test && file_exists($test)) {
$t= &PHPTTest::fromFile($test);
echo ''.basename($t->name), ': ', 
$t->description.'';
echo 'Back to test suite';
flush();

// Run the test
$result= $t->run();

// Evaluate results
if ($result) {
  echo 'Passed';
} else {
  echo 'Failed';

  echo 'Actual output';
  echo '', $t->output, '';

  echo 'Expectancy';
  echo '', $t->expectancy->expected, '';
}

echo '';
exit();
  }
  
  echo 'Test suite';
  
  // phpinfo() links
  echo 'phpinfo(): ';
  foreach (array(
1   => 'General', 
4   => 'Configuration', 
8   => 'Modules'  
  ) as $const => $name) {
printf('%s | ', $const, $name);
  }
  echo '(All)';
  
  echo 'Select one to run';
  echo '';
  $d= dir(dirname(__FILE__));
  while ($entry= $d->read()) {
if ('.phpt' != substr($entry, -5)) continue;
echo ''.$entry.'';
  }
  $d->close();
  echo '';
  
  echo <<<__

  
__;
  // }}}
?>

-- 
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 bug22403.phpt bug26407.phpt bug27843.phpt bug28354.phpt test_appname.phpt

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 07:59:04 2005 EDT

  Modified files:  
/php-src/ext/sybase_ct/testsbug22403.phpt bug26407.phpt 
bug27843.phpt bug28354.phpt 
test_appname.phpt 
  Log:
  - Prefixed all temporary names with "phpt_"
  
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/bug22403.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sybase_ct/tests/bug22403.phpt
diff -u php-src/ext/sybase_ct/tests/bug22403.phpt:1.1 
php-src/ext/sybase_ct/tests/bug22403.phpt:1.2
--- php-src/ext/sybase_ct/tests/bug22403.phpt:1.1   Fri Jan 23 21:18:13 2004
+++ php-src/ext/sybase_ct/tests/bug22403.phpt   Sun Feb  6 07:59:03 2005
@@ -6,7 +6,7 @@
 http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/bug26407.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sybase_ct/tests/bug26407.phpt
diff -u php-src/ext/sybase_ct/tests/bug26407.phpt:1.1 
php-src/ext/sybase_ct/tests/bug26407.phpt:1.2
--- php-src/ext/sybase_ct/tests/bug26407.phpt:1.1   Fri Jan 23 21:54:33 2004
+++ php-src/ext/sybase_ct/tests/bug26407.phpt   Sun Feb  6 07:59:03 2005
@@ -6,7 +6,7 @@
 >> Query: 
 begin transaction
   -- no result returned...
-  update #bug26407 set the_big_answer=42
+  update #phpt_bug26407 set the_big_answer=42
 commit
   
 <<< Return: boolean
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/bug27843.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sybase_ct/tests/bug27843.phpt
diff -u php-src/ext/sybase_ct/tests/bug27843.phpt:1.2 
php-src/ext/sybase_ct/tests/bug27843.phpt:1.3
--- php-src/ext/sybase_ct/tests/bug27843.phpt:1.2   Sun Feb  6 06:58:18 2005
+++ php-src/ext/sybase_ct/tests/bug27843.phpt   Sun Feb  6 07:59:03 2005
@@ -6,7 +6,7 @@
 >> Query: exec bug27843
+>>> Query: exec phpt_bug27843
 <<< Return: resource
 array(1) {
   [0]=>
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/bug28354.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/sybase_ct/tests/bug28354.phpt
diff -u php-src/ext/sybase_ct/tests/bug28354.phpt:1.2 
php-src/ext/sybase_ct/tests/bug28354.phpt:1.3
--- php-src/ext/sybase_ct/tests/bug28354.phpt:1.2   Fri May 21 16:53:01 2004
+++ php-src/ext/sybase_ct/tests/bug28354.phpt   Sun Feb  6 07:59:03 2005
@@ -6,7 +6,7 @@
 http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/test_appname.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sybase_ct/tests/test_appname.phpt
diff -u php-src/ext/sybase_ct/tests/test_appname.phpt:1.1 
php-src/ext/sybase_ct/tests/test_appname.phpt:1.2
--- php-src/ext/sybase_ct/tests/test_appname.phpt:1.1   Fri Jan 23 21:42:26 2004
+++ php-src/ext/sybase_ct/tests/test_appname.phpt   Sun Feb  6 07:59:03 2005
@@ -6,7 +6,7 @@
 
@@ -58,7 +58,7 @@
 ["hostname"]=>
 string(10) "php.net%s"
 ["program_name"]=>
-string(16) "test_appname%s"
+string(16) "phpt_test%s"
   }
 }
 bool(true)

-- 
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 bug30312.phpt

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 06:58:54 2005 EDT

  Added files: 
/php-src/ext/sybase_ct/testsbug30312.phpt 
  Log:
  - Initial release
  # Works perfectly with php-cli
  

http://cvs.php.net/co.php/php-src/ext/sybase_ct/tests/bug30312.phpt?r=1.1&p=1
Index: php-src/ext/sybase_ct/tests/bug30312.phpt
+++ php-src/ext/sybase_ct/tests/bug30312.phpt
--TEST--
Sybase-CT bug #30312 (sybase_unbuffered_query calls)
--SKIPIF--

--FILE--

--EXPECTF--
string(%d) "%s  %d %d %d:%d%s"
string(%d) "%s  %d %d %d:%d%s"

-- 
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 bug27843.phpt

2005-02-06 Thread Timm Friebe
thekid  Sun Feb  6 06:58:20 2005 EDT

  Modified files:  
/php-src/ext/sybase_ct/testsbug27843.phpt 
  Log:
  - "Unified" test name
  
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/bug27843.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/sybase_ct/tests/bug27843.phpt
diff -u php-src/ext/sybase_ct/tests/bug27843.phpt:1.1 
php-src/ext/sybase_ct/tests/bug27843.phpt:1.2
--- php-src/ext/sybase_ct/tests/bug27843.phpt:1.1   Sun Jul 11 12:31:32 2004
+++ php-src/ext/sybase_ct/tests/bug27843.phpt   Sun Feb  6 06:58:18 2005
@@ -1,12 +1,12 @@
 --TEST--
-Sybase-CT bug #27843: notices when query is a stored procedure
+Sybase-CT bug #27843 (notices when query is a stored procedure)
 --SKIPIF--
 
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php