date:20040811

[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in /main php_version.h ZendEngine2 zend.h

2004-08-11 Thread Andi Gutmans

andiThu Aug 12 02:39:26 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcconfigure.in 
/ZendEngine2zend.h 
/php-src/main   php_version.h 
  Log:
  - Back to -dev
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.3&r2=1.514.2.4&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.3 php-src/configure.in:1.514.2.4
--- php-src/configure.in:1.514.2.3  Thu Aug 12 02:35:21 2004
+++ php-src/configure.inThu Aug 12 02:39:26 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.3 2004/08/12 06:35:21 andi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.4 2004/08/12 06:39:26 andi Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=1
-EXTRA_VERSION="RC2"
+EXTRA_VERSION="-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.257.2.4&r2=1.257.2.5&ty=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.257.2.4 ZendEngine2/zend.h:1.257.2.5
--- ZendEngine2/zend.h:1.257.2.4Thu Aug 12 02:35:22 2004
+++ ZendEngine2/zend.h  Thu Aug 12 02:39:26 2004
@@ -17,12 +17,12 @@
+--+
 */
 
-/* $Id: zend.h,v 1.257.2.4 2004/08/12 06:35:22 andi Exp $ */
+/* $Id: zend.h,v 1.257.2.5 2004/08/12 06:39:26 andi Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.0.1RC2"
+#define ZEND_VERSION "2.0.1-dev"
 
 #define ZEND_ENGINE_2
 
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.3&r2=1.97.2.4&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.3 php-src/main/php_version.h:1.97.2.4
--- php-src/main/php_version.h:1.97.2.3 Thu Aug 12 02:35:22 2004
+++ php-src/main/php_version.h  Thu Aug 12 02:39:26 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION "RC2"
-#define PHP_VERSION "5.0.1RC2"
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.0.1-dev"

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h ZendEngine2 zend.h

2004-08-11 Thread Andi Gutmans

andiThu Aug 12 02:35:22 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS configure.in 
/ZendEngine2zend.h 
/php-src/main   php_version.h 
  Log:
  - 5.0.1RC2
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.35&r2=1.1760.2.36&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.35 php-src/NEWS:1.1760.2.36
--- php-src/NEWS:1.1760.2.35Thu Aug 12 01:42:13 2004
+++ php-src/NEWSThu Aug 12 02:35:21 2004
@@ -1,10 +1,10 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5.0.1
+
+11 Aug 2004, PHP 5.0.1RC2
 - Fixed bug #29606 (php_strip_whitespace() prints to stdout rather then
   returning the value). (Ilia)
-
-10 Aug 2004, PHP 5.0.1RC1
 - Changed destructor mechanism so that destructors are called prior to request
   shutdown. (Marcus)
 - Rewritten UNIX and Windows install help files. (Documentation Team)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.2&r2=1.514.2.3&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.2 php-src/configure.in:1.514.2.3
--- php-src/configure.in:1.514.2.2  Tue Aug 10 03:28:05 2004
+++ php-src/configure.inThu Aug 12 02:35:21 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.2 2004/08/10 07:28:05 andi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.3 2004/08/12 06:35:21 andi Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=1
-EXTRA_VERSION="-dev"
+EXTRA_VERSION="RC2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.257.2.3&r2=1.257.2.4&ty=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.257.2.3 ZendEngine2/zend.h:1.257.2.4
--- ZendEngine2/zend.h:1.257.2.3Tue Aug 10 03:28:09 2004
+++ ZendEngine2/zend.h  Thu Aug 12 02:35:22 2004
@@ -17,12 +17,12 @@
+--+
 */
 
-/* $Id: zend.h,v 1.257.2.3 2004/08/10 07:28:09 andi Exp $ */
+/* $Id: zend.h,v 1.257.2.4 2004/08/12 06:35:22 andi Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.0.1-dev"
+#define ZEND_VERSION "2.0.1RC2"
 
 #define ZEND_ENGINE_2
 
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.2&r2=1.97.2.3&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.2 php-src/main/php_version.h:1.97.2.3
--- php-src/main/php_version.h:1.97.2.2 Tue Aug 10 03:28:09 2004
+++ php-src/main/php_version.h  Thu Aug 12 02:35:22 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.0.1-dev"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.0.1RC2"

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

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

2004-08-11 Thread Andi Gutmans

andiThu Aug 12 02:17:42 2004 EDT

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  - Use FREE_HASHTABLE()
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.271&r2=1.272&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.271 php-src/ext/standard/array.c:1.272
--- php-src/ext/standard/array.c:1.271  Tue Aug 10 02:00:30 2004
+++ php-src/ext/standard/array.cThu Aug 12 02:17:42 2004
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.271 2004/08/10 06:00:30 moriyoshi Exp $ */
+/* $Id: array.c,v 1.272 2004/08/12 06:17:42 andi Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1988,7 +1988,7 @@
   hashtable and replace it with new one */
new_hash = php_splice(Z_ARRVAL_P(stack), 0, 0, &args[1], argc-1, NULL);
zend_hash_destroy(Z_ARRVAL_P(stack));
-   efree(Z_ARRVAL_P(stack));
+   FREE_HASHTABLE(Z_ARRVAL_P(stack));
Z_ARRVAL_P(stack) = new_hash;
 
/* Clean up and return the number of elements in the stack */

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

2004-08-11 Thread Magnus Määttä

magnus  Thu Aug 12 01:42:13 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  Add missing NEWS entry (bug 29147).
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.34&r2=1.1760.2.35&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.34 php-src/NEWS:1.1760.2.35
--- php-src/NEWS:1.1760.2.34Wed Aug 11 11:23:00 2004
+++ php-src/NEWSThu Aug 12 01:42:13 2004
@@ -43,6 +43,7 @@
   timezone).  (Wez)
 - Fixed bug #29256 (error when sending large packets on a socket). (Dmitry)
 - Fixed bug #29236 (memory error when wsdl-cache is enabled). (Dmitry)
+- Fixed bug #29147 (Compile Error in mnoGoSearch functions). (Sergey, Antony)
 - Fixed bug #29132 ($_SERVER["PHP_AUTH_USER"] isn't defined). (Stefan)
 - Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi)
 - Fixed bug #29109 (SoapFault exception: [WSDL] Out of memory). (Dmitry)

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/dba/tests dba_cdb_make.phpt

2004-08-11 Thread Marcus Boerger

helly   Wed Aug 11 20:38:20 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/dba/tests  dba_cdb_make.phpt 
  Log:
  MFH: Change to use md5_file()
  
http://cvs.php.net/diff.php/php-src/ext/dba/tests/dba_cdb_make.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/dba/tests/dba_cdb_make.phpt
diff -u php-src/ext/dba/tests/dba_cdb_make.phpt:1.1.2.2 
php-src/ext/dba/tests/dba_cdb_make.phpt:1.1.2.3
--- php-src/ext/dba/tests/dba_cdb_make.phpt:1.1.2.2 Mon May  5 21:26:21 2003
+++ php-src/ext/dba/tests/dba_cdb_make.phpt Wed Aug 11 20:38:20 2004
@@ -14,7 +14,7 @@
require_once('test.inc');
echo "database handler: $handler\n";
// print md5 checksum of test.cdb which is generated by cdb_make program
-   var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb';
+   var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("1", "1", $db_make);
dba_insert("2", "2", $db_make);
@@ -26,7 +26,7 @@
 // dba_replace cdb_make doesn't know replace
dba_close($db_make);
// write md5 checksum of generated database file
-   var_dump(md5(implode('',file($db_file;
+   var_dump(md5_file($db_file));
// no need to test created database: this is done by dba_cdb_read.phpt
} else {
echo "Error creating database\n";
@@ -34,5 +34,5 @@
 ?>
 --EXPECT--
 database handler: cdb_make
-string(32) "723d19f39c1b15b3b455dd64323148d1"
-string(32) "723d19f39c1b15b3b455dd64323148d1"
\ No newline at end of file
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
\ No newline at end of file

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/dba/tests dba_cdb_make.phpt

2004-08-11 Thread Marcus Boerger

helly   Wed Aug 11 20:38:12 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/dba/tests  dba_cdb_make.phpt 
  Log:
  MFH: Change to use md5_file()
  
http://cvs.php.net/diff.php/php-src/ext/dba/tests/dba_cdb_make.phpt?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/ext/dba/tests/dba_cdb_make.phpt
diff -u php-src/ext/dba/tests/dba_cdb_make.phpt:1.3 
php-src/ext/dba/tests/dba_cdb_make.phpt:1.3.2.1
--- php-src/ext/dba/tests/dba_cdb_make.phpt:1.3 Tue Mar  4 15:31:42 2003
+++ php-src/ext/dba/tests/dba_cdb_make.phpt Wed Aug 11 20:38:12 2004
@@ -14,7 +14,7 @@
require_once('test.inc');
echo "database handler: $handler\n";
// print md5 checksum of test.cdb which is generated by cdb_make program
-   var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb';
+   var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("1", "1", $db_make);
dba_insert("2", "2", $db_make);
@@ -26,7 +26,7 @@
 // dba_replace cdb_make doesn't know replace
dba_close($db_make);
// write md5 checksum of generated database file
-   var_dump(md5(implode('',file($db_file;
+   var_dump(md5_file($db_file));
// no need to test created database: this is done by dba_cdb_read.phpt
} else {
echo "Error creating database\n";
@@ -34,5 +34,5 @@
 ?>
 --EXPECT--
 database handler: cdb_make
-string(32) "723d19f39c1b15b3b455dd64323148d1"
-string(32) "723d19f39c1b15b3b455dd64323148d1"
\ No newline at end of file
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
\ No newline at end of file

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

[PHP-CVS] cvs: php-src /ext/dba/tests dba_cdb_make.phpt

2004-08-11 Thread Marcus Boerger

helly   Wed Aug 11 20:38:01 2004 EDT

  Modified files:  
/php-src/ext/dba/tests  dba_cdb_make.phpt 
  Log:
  Change to use md5_file()
  
http://cvs.php.net/diff.php/php-src/ext/dba/tests/dba_cdb_make.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/dba/tests/dba_cdb_make.phpt
diff -u php-src/ext/dba/tests/dba_cdb_make.phpt:1.3 
php-src/ext/dba/tests/dba_cdb_make.phpt:1.4
--- php-src/ext/dba/tests/dba_cdb_make.phpt:1.3 Tue Mar  4 15:31:42 2003
+++ php-src/ext/dba/tests/dba_cdb_make.phpt Wed Aug 11 20:38:01 2004
@@ -14,7 +14,7 @@
require_once('test.inc');
echo "database handler: $handler\n";
// print md5 checksum of test.cdb which is generated by cdb_make program
-   var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb';
+   var_dump(md5_file(dirname(__FILE__).'/test.cdb'));
if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) {
dba_insert("1", "1", $db_make);
dba_insert("2", "2", $db_make);
@@ -26,7 +26,7 @@
 // dba_replace cdb_make doesn't know replace
dba_close($db_make);
// write md5 checksum of generated database file
-   var_dump(md5(implode('',file($db_file;
+   var_dump(md5_file($db_file));
// no need to test created database: this is done by dba_cdb_read.phpt
} else {
echo "Error creating database\n";
@@ -34,5 +34,5 @@
 ?>
 --EXPECT--
 database handler: cdb_make
-string(32) "723d19f39c1b15b3b455dd64323148d1"
-string(32) "723d19f39c1b15b3b455dd64323148d1"
\ No newline at end of file
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
\ No newline at end of file

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

[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug21820.phpt

2004-08-11 Thread Marcus Boerger

helly   Wed Aug 11 19:56:57 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/tests/lang bug21820.phpt 
  Log:
  MFH: make bison --version independant
  
http://cvs.php.net/diff.php/php-src/tests/lang/bug21820.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/tests/lang/bug21820.phpt
diff -u php-src/tests/lang/bug21820.phpt:1.1.2.2 
php-src/tests/lang/bug21820.phpt:1.1.2.3
--- php-src/tests/lang/bug21820.phpt:1.1.2.2Fri May  2 19:27:46 2003
+++ php-src/tests/lang/bug21820.phptWed Aug 11 19:56:56 2004
@@ -10,4 +10,4 @@
 
 ?>
 --EXPECTREGEX--
-Parse error: parse error,.*expecting `?T_STRING'? or `?T_VARIABLE'? or 
`?T_NUM_STRING'? in .* on line .*
+Parse error: (parse|syntax) error, .*expecting `?T_STRING'? or `?T_VARIABLE'? or 
`?T_NUM_STRING'? in .*bug21820.php on line .*

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gd_topal.c

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 19:25:54 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/gd/libgd   gd_topal.c 
  Log:
  MFH: Fixed memory leak.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_topal.c?r1=1.8.2.7&r2=1.8.2.8&ty=u
Index: php-src/ext/gd/libgd/gd_topal.c
diff -u php-src/ext/gd/libgd/gd_topal.c:1.8.2.7 php-src/ext/gd/libgd/gd_topal.c:1.8.2.8
--- php-src/ext/gd/libgd/gd_topal.c:1.8.2.7 Thu Jul 22 19:09:24 2004
+++ php-src/ext/gd/libgd/gd_topal.c Wed Aug 11 19:25:54 2004
@@ -1926,7 +1926,8 @@
   init_error_limit (oim, nim, cquantize);
   arraysize = (size_t) ((nim->sx + 2) * (3 * sizeof (FSERROR)));
   /* Allocate Floyd-Steinberg workspace. */
-  cquantize->fserrors = gdCalloc (arraysize, 1);
+  cquantize->fserrors = gdRealloc(cquantize->fserrors, arraysize);
+  memset(cquantize->fserrors, 0, arraysize);
   if (!cquantize->fserrors)
 {
   goto outOfMemory;

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/gd/libgd gd_topal.c

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 19:25:52 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/gd/libgd   gd_topal.c 
  Log:
  MFH: Fixed memory leak.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_topal.c?r1=1.15.2.1&r2=1.15.2.2&ty=u
Index: php-src/ext/gd/libgd/gd_topal.c
diff -u php-src/ext/gd/libgd/gd_topal.c:1.15.2.1 
php-src/ext/gd/libgd/gd_topal.c:1.15.2.2
--- php-src/ext/gd/libgd/gd_topal.c:1.15.2.1Thu Jul 22 18:59:11 2004
+++ php-src/ext/gd/libgd/gd_topal.c Wed Aug 11 19:25:52 2004
@@ -1926,7 +1926,8 @@
   init_error_limit (oim, nim, cquantize);
   arraysize = (size_t) ((nim->sx + 2) * (3 * sizeof (FSERROR)));
   /* Allocate Floyd-Steinberg workspace. */
-  cquantize->fserrors = gdCalloc (arraysize, 1);
+  cquantize->fserrors = gdRealloc(cquantize->fserrors, arraysize);
+  memset(cquantize->fserrors, 0, arraysize);
   if (!cquantize->fserrors)
 {
   goto outOfMemory;

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

[PHP-CVS] cvs: php-src /ext/gd/libgd gd_topal.c

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 19:25:50 2004 EDT

  Modified files:  
/php-src/ext/gd/libgd   gd_topal.c 
  Log:
  Fixed memory leak.
  
  
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_topal.c?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/gd/libgd/gd_topal.c
diff -u php-src/ext/gd/libgd/gd_topal.c:1.16 php-src/ext/gd/libgd/gd_topal.c:1.17
--- php-src/ext/gd/libgd/gd_topal.c:1.16Thu Jul 22 18:38:59 2004
+++ php-src/ext/gd/libgd/gd_topal.c Wed Aug 11 19:25:50 2004
@@ -1926,7 +1926,8 @@
   init_error_limit (oim, nim, cquantize);
   arraysize = (size_t) ((nim->sx + 2) * (3 * sizeof (FSERROR)));
   /* Allocate Floyd-Steinberg workspace. */
-  cquantize->fserrors = gdCalloc (arraysize, 1);
+  cquantize->fserrors = gdRealloc(cquantize->fserrors, arraysize);
+  memset(cquantize->fserrors, 0, arraysize);
   if (!cquantize->fserrors)
 {
   goto outOfMemory;

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

[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in /main php_version.h

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 19:19:44 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  back to dev.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.120&r2=1.396.2.121&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.120 php-src/configure.in:1.396.2.121
--- php-src/configure.in:1.396.2.120Wed Aug 11 18:42:47 2004
+++ php-src/configure.inWed Aug 11 19:19:44 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.120 2004/08/11 22:42:47 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.121 2004/08/11 23:19:44 iliaa Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=9
-EXTRA_VERSION="RC1"
+EXTRA_VERSION="RC2-dev"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.62&r2=1.66.2.63&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.62 php-src/main/php_version.h:1.66.2.63
--- php-src/main/php_version.h:1.66.2.62Wed Aug 11 18:42:47 2004
+++ php-src/main/php_version.h  Wed Aug 11 19:19:44 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 9
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "4.3.9RC1"
+#define PHP_EXTRA_VERSION "RC2-dev"
+#define PHP_VERSION "4.3.9RC2-dev"

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

[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in /main php_version.h

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 18:42:47 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  4.3.9RC1 is a go.
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.119&r2=1.396.2.120&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.119 php-src/configure.in:1.396.2.120
--- php-src/configure.in:1.396.2.119Tue Jul 13 08:58:49 2004
+++ php-src/configure.inWed Aug 11 18:42:47 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.119 2004/07/13 12:58:49 derick Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.120 2004/08/11 22:42:47 iliaa Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=4
 MINOR_VERSION=3
 RELEASE_VERSION=9
-EXTRA_VERSION="-dev"
+EXTRA_VERSION="RC1"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.61&r2=1.66.2.62&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.66.2.61 php-src/main/php_version.h:1.66.2.62
--- php-src/main/php_version.h:1.66.2.61Tue Jul 13 08:58:49 2004
+++ php-src/main/php_version.h  Wed Aug 11 18:42:47 2004
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 9
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "4.3.9-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "4.3.9RC1"

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

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

2004-08-11 Thread Ilia Alshanetsky

iliaa   Wed Aug 11 18:40:46 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  Bug fixing news.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.713&r2=1.1247.2.714&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.713 php-src/NEWS:1.1247.2.714
--- php-src/NEWS:1.1247.2.713   Tue Aug 10 03:00:11 2004
+++ php-src/NEWSWed Aug 11 18:40:46 2004
@@ -1,10 +1,12 @@
 PHP 4  NEWS
 |||
-?? ??? 2004, Version 4.3.9
+11 Aug 2004, Version 4.3.9RC1
 - Rewritten UNIX and Windows install help files. (Documentation Team)
 - Updated PCRE to provide better error handling in certain cases. (Andrei)
 - NSAPI: added "bucket" parameter to list of non-php.ini-keys of php4_execute
   for doing performance stats without warnings in server-log. (Uwe Schindler)
+- Fixed bug #29607 (highlighting code with HEREDOC produces invalid
+  output). (Ilia)
 - Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode). (Ilia)
 - Fixed bug #29493 (extract(array, EXTR_REFS) misbehaves with elements
   referred twice or more times). (Moriyoshi)

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

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

2004-08-11 Thread Marcus Boerger

helly   Wed Aug 11 16:51:41 2004 EDT

  Modified files:  
/php-src/sapi/apache2handlersapi_apache2.c 
  Log:
  TSRM fix
  
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.43&r2=1.44&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.43 
php-src/sapi/apache2handler/sapi_apache2.c:1.44
--- php-src/sapi/apache2handler/sapi_apache2.c:1.43 Tue Aug 10 13:40:00 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Aug 11 16:51:41 2004
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: sapi_apache2.c,v 1.43 2004/08/10 17:40:00 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.44 2004/08/11 20:51:41 helly Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -278,8 +278,10 @@
 }
 
 static time_t php_apache_sapi_get_request_time(void) {
-   php_struct *ctx = SG(server_context);
+   php_struct *ctx;
TSRMLS_FETCH();
+   
+   ctx = SG(server_context);
 
return ctx->r->request_time;
 }

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

2004-08-11 Thread Derick Rethans

derick  Wed Aug 11 11:23:01 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  - Tix Fypo
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.33&r2=1.1760.2.34&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.33 php-src/NEWS:1.1760.2.34
--- php-src/NEWS:1.1760.2.33Wed Aug 11 08:24:41 2004
+++ php-src/NEWSWed Aug 11 11:23:00 2004
@@ -5,7 +5,7 @@
   returning the value). (Ilia)
 
 10 Aug 2004, PHP 5.0.1RC1
-- Changed destructor mechanism so that derstructors are called prior to request
+- Changed destructor mechanism so that destructors are called prior to request
   shutdown. (Marcus)
 - Rewritten UNIX and Windows install help files. (Documentation Team)
 - Updated several libraries bundled with the windows release which now 

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

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

2004-08-11 Thread Derick Rethans

derick  Wed Aug 11 08:33:03 2004 EDT

  Modified files:  
/php-src/ext/standard   image.c 
  Log:
  - Added a notice to getimagesize in case zlib is not available and a compressed
SWF movie has been passed to the function.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.99 php-src/ext/standard/image.c:1.100
--- php-src/ext/standard/image.c:1.99   Thu Jul 29 21:10:41 2004
+++ php-src/ext/standard/image.cWed Aug 11 08:33:03 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.99 2004/07/30 01:10:41 iliaa Exp $ */
+/* $Id: image.c,v 1.100 2004/08/11 12:33:03 derick Exp $ */
 
 #include "php.h"
 #include 
@@ -1288,11 +1288,14 @@
case IMAGE_FILETYPE_SWF:
result = php_handle_swf(stream TSRMLS_CC);
break;
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
case IMAGE_FILETYPE_SWC:
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
result = php_handle_swc(stream TSRMLS_CC);
-   break;
+#else
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a 
compressed SWF file, but you do not have a static version of the zlib extension 
enabled.");
+
 #endif
+   break;
case IMAGE_FILETYPE_PSD:
result = php_handle_psd(stream TSRMLS_CC);
break;

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard image.c

2004-08-11 Thread Derick Rethans

derick  Wed Aug 11 08:31:39 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   image.c 
  Log:
  - MFH: Added a notice to getimagesize in case zlib is not available and a
compressed SWF movie has been passed to the function.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.1&r2=1.98.2.2&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.1 php-src/ext/standard/image.c:1.98.2.2
--- php-src/ext/standard/image.c:1.98.2.1   Thu Jul 29 21:10:42 2004
+++ php-src/ext/standard/image.cWed Aug 11 08:31:37 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: image.c,v 1.98.2.1 2004/07/30 01:10:42 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.2 2004/08/11 12:31:37 derick Exp $ */
 
 #include "php.h"
 #include 
@@ -1288,11 +1288,14 @@
case IMAGE_FILETYPE_SWF:
result = php_handle_swf(stream TSRMLS_CC);
break;
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
case IMAGE_FILETYPE_SWC:
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
result = php_handle_swc(stream TSRMLS_CC);
-   break;
+#else
+   php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a 
compressed SWF file, but you do not have a static version of the zlib extension 
enabled.");
+
 #endif
+   break;
case IMAGE_FILETYPE_PSD:
result = php_handle_psd(stream TSRMLS_CC);
break;

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

2004-08-11 Thread Derick Rethans

derick  Wed Aug 11 08:24:42 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  - Reworded this a bit
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.32&r2=1.1760.2.33&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.32 php-src/NEWS:1.1760.2.33
--- php-src/NEWS:1.1760.2.32Tue Aug 10 18:40:14 2004
+++ php-src/NEWSWed Aug 11 08:24:41 2004
@@ -5,7 +5,8 @@
   returning the value). (Ilia)
 
 10 Aug 2004, PHP 5.0.1RC1
-- Call destructors prior to request shutdown. (Marcus)
+- Changed destructor mechanism so that derstructors are called prior to request
+  shutdown. (Marcus)
 - Rewritten UNIX and Windows install help files. (Documentation Team)
 - Updated several libraries bundled with the windows release which now 
   includes libxml2-2.6.11, libxslt-1.1.7 and iconv-1.9.1. (Rob, Edin)

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/dom/tests dom005.phpt

2004-08-11 Thread Christian Stocker

chregu  Wed Aug 11 04:24:41 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/dom/tests  dom005.phpt 
  Log:
  MFH (fix test)
  
  
http://cvs.php.net/diff.php/php-src/ext/dom/tests/dom005.phpt?r1=1.3&r2=1.3.2.1&ty=u
Index: php-src/ext/dom/tests/dom005.phpt
diff -u php-src/ext/dom/tests/dom005.phpt:1.3 php-src/ext/dom/tests/dom005.phpt:1.3.2.1
--- php-src/ext/dom/tests/dom005.phpt:1.3   Thu Oct 30 05:06:00 2003
+++ php-src/ext/dom/tests/dom005.phpt   Wed Aug 11 04:24:41 2004
@@ -23,7 +23,7 @@
 http://www.w3.org/TR/REC-html40/loose.dtd";>
 Hello world
 This is a not well-formed
-html files with undeclared entities 
+html files with undeclared entities 
 
 --- save as HTML
 http://www.w3.org/TR/REC-html40/loose.dtd";>

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

[PHP-CVS] cvs: php-src /ext/dom/tests dom005.phpt

2004-08-11 Thread Christian Stocker

chregu  Wed Aug 11 04:23:27 2004 EDT

  Modified files:  
/php-src/ext/dom/tests  dom005.phpt 
  Log:
  fix test 
  
  
http://cvs.php.net/diff.php/php-src/ext/dom/tests/dom005.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/dom/tests/dom005.phpt
diff -u php-src/ext/dom/tests/dom005.phpt:1.3 php-src/ext/dom/tests/dom005.phpt:1.4
--- php-src/ext/dom/tests/dom005.phpt:1.3   Thu Oct 30 05:06:00 2003
+++ php-src/ext/dom/tests/dom005.phpt   Wed Aug 11 04:23:26 2004
@@ -23,7 +23,7 @@
 http://www.w3.org/TR/REC-html40/loose.dtd";>
 Hello world
 This is a not well-formed
-html files with undeclared entities 
+html files with undeclared entities 
 
 --- save as HTML
 http://www.w3.org/TR/REC-html40/loose.dtd";>

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

[PHP-CVS] cvs: php-src(PHP_5_0) / configure.in /main php_version.h ZendEngine2 zend.h

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in /main php_version.h ZendEngine2 zend.h

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

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/dba/tests dba_cdb_make.phpt

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/dba/tests dba_cdb_make.phpt

[PHP-CVS] cvs: php-src /ext/dba/tests dba_cdb_make.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) /tests/lang bug21820.phpt

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/gd/libgd gd_topal.c

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/gd/libgd gd_topal.c

[PHP-CVS] cvs: php-src /ext/gd/libgd gd_topal.c

[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in /main php_version.h

[PHP-CVS] cvs: php-src(PHP_4_3) / configure.in /main php_version.h

[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS

[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard image.c

[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/dom/tests dom005.phpt

[PHP-CVS] cvs: php-src /ext/dom/tests dom005.phpt

21 matches

Site Navigation

Mail list logo

Footer information