date:20061211

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2006-12-11 Thread changelog

changelog   Tue Dec 12 01:31:15 2006 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1033r2=1.1034diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1033 ZendEngine2/ChangeLog:1.1034
--- ZendEngine2/ChangeLog:1.1033Sat Dec  9 01:31:06 2006
+++ ZendEngine2/ChangeLog   Tue Dec 12 01:31:15 2006
@@ -1,3 +1,23 @@
+2006-12-11  Andrei Zmievski  [EMAIL PROTECTED]
+
+* zend.c:
+  Clarify stream_encoding.
+
+2006-12-11  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  zend_operators.c:
+  Fixed typo
+
+* (PHP_5_2)
+  zend_operators.c:
+  Removed boollong optimization as it causes issues with strict type 
checks
+
+* (PHP_5_2)
+  zend_operators.c
+  zend_operators.h:
+  Minor optimization (2-3%) from Brian Shire
+
 2006-12-08  Dmitry Stogov  [EMAIL PROTECTED]
 
 * zend_execute.c
@@ -16026,7 +16046,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1033 2006/12/09 01:31:06 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1034 2006/12/12 01:31:15 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -17750,7 +17770,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1033 2006/12/09 01:31:06 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1034 2006/12/12 01:31:15 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src /ext/oci8/tests lob_027.phpt

2006-12-11 Thread Antony Dovgal

tony2001Mon Dec 11 12:31:55 2006 UTC

  Added files: 
/php-src/ext/oci8/tests lob_027.phpt 
  Log:
  add new test
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_027.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/lob_027.phpt
+++ php-src/ext/oci8/tests/lob_027.phpt
--TEST--
oci_lob_truncate()
--SKIPIF--
?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
--FILE--
?php

require dirname(__FILE__).'/connect.inc';
require dirname(__FILE__).'/create_table.inc';

$ora_sql = INSERT INTO
   .$schema.$table_name. (blob)
  VALUES (empty_blob())
  RETURNING
   blob
  INTO :v_blob ;

$statement = oci_parse($c,$ora_sql);
$blob = oci_new_descriptor($c,OCI_D_LOB);
oci_bind_by_name($statement,:v_blob, $blob,-1,OCI_B_BLOB);
oci_execute($statement, OCI_DEFAULT);

var_dump($blob);

$str = bthis is a bg faaat test string. why are you reading it, I wonder? 
=);
var_dump($blob-write($str));

oci_commit($c);

$select_sql = SELECT blob FROM .$schema.$table_name. FOR UPDATE;
$s = oci_parse($c, $select_sql);
oci_execute($s, OCI_DEFAULT);

var_dump($row = oci_fetch_array($s));
oci_commit($c);

for ($i = 5; $i = 0; $i--) {

$select_sql = SELECT blob FROM .$schema.$table_name. FOR UPDATE;
$s = oci_parse($c, $select_sql);
oci_execute($s, OCI_DEFAULT);

$row = oci_fetch_array($s);
var_dump($row['BLOB']-load());
var_dump($row['BLOB']-truncate(($i-1)*10));

oci_commit($c);
}


require dirname(__FILE__).'/drop_table.inc';

echo Done\n;

?
--EXPECTF--
object(OCI-Lob)#%d (1) {
  [descriptor]=
  resource(%d) of type (oci8 descriptor)
}
int(72)
array(2) {
  [0]=
  object(OCI-Lob)#%d (1) {
[descriptor]=
resource(%d) of type (oci8 descriptor)
  }
  [BLOB]=
  object(OCI-Lob)#%d (1) {
[descriptor]=
resource(%d) of type (oci8 descriptor)
  }
}
string(72) this is a bg faaat test string. why are you reading it, I 
wonder? =)
bool(true)
string(40) this is a bg faaat test string. why 
bool(true)
string(30) this is a bg faaat test st
bool(true)
string(20) this is a bg faa
bool(true)
string(10) this is a 
bool(true)
string(0) 

Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in 
%s on line %d
bool(false)
Done
--UEXPECTF--
object(OCI-Lob)#%d (1) {
  [udescriptor]=
  resource(%d) of type (oci8 descriptor)
}
int(72)
array(2) {
  [0]=
  object(OCI-Lob)#%d (1) {
[udescriptor]=
resource(%d) of type (oci8 descriptor)
  }
  [uBLOB]=
  object(OCI-Lob)#%d (1) {
[udescriptor]=
resource(%d) of type (oci8 descriptor)
  }
}
string(72) this is a bg faaat test string. why are you reading it, I 
wonder? =)
bool(true)
string(40) this is a bg faaat test string. why 
bool(true)
string(30) this is a bg faaat test st
bool(true)
string(20) this is a bg faa
bool(true)
string(10) this is a 
bool(true)
string(0) 

Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in 
%s on line %d
bool(false)
Done

-- 
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/oci8/tests lob_027.phpt

2006-12-11 Thread Antony Dovgal

tony2001Mon Dec 11 12:32:06 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/oci8/tests lob_027.phpt 
  Log:
  add new test
  
  

http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/lob_027.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/lob_027.phpt
+++ php-src/ext/oci8/tests/lob_027.phpt
--TEST--
oci_lob_truncate()
--SKIPIF--
?php if (!extension_loaded('oci8')) die(skip no oci8 extension); ?
--FILE--
?php

require dirname(__FILE__).'/connect.inc';
require dirname(__FILE__).'/create_table.inc';

$ora_sql = INSERT INTO
   .$schema.$table_name. (blob)
  VALUES (empty_blob())
  RETURNING
   blob
  INTO :v_blob ;

$statement = oci_parse($c,$ora_sql);
$blob = oci_new_descriptor($c,OCI_D_LOB);
oci_bind_by_name($statement,:v_blob, $blob,-1,OCI_B_BLOB);
oci_execute($statement, OCI_DEFAULT);

var_dump($blob);

$str = bthis is a bg faaat test string. why are you reading it, I wonder? 
=);
var_dump($blob-write($str));

oci_commit($c);

$select_sql = SELECT blob FROM .$schema.$table_name. FOR UPDATE;
$s = oci_parse($c, $select_sql);
oci_execute($s, OCI_DEFAULT);

var_dump($row = oci_fetch_array($s));
oci_commit($c);

for ($i = 5; $i = 0; $i--) {

$select_sql = SELECT blob FROM .$schema.$table_name. FOR UPDATE;
$s = oci_parse($c, $select_sql);
oci_execute($s, OCI_DEFAULT);

$row = oci_fetch_array($s);
var_dump($row['BLOB']-load());
var_dump($row['BLOB']-truncate(($i-1)*10));

oci_commit($c);
}


require dirname(__FILE__).'/drop_table.inc';

echo Done\n;

?
--EXPECTF--
object(OCI-Lob)#%d (1) {
  [descriptor]=
  resource(%d) of type (oci8 descriptor)
}
int(72)
array(2) {
  [0]=
  object(OCI-Lob)#%d (1) {
[descriptor]=
resource(%d) of type (oci8 descriptor)
  }
  [BLOB]=
  object(OCI-Lob)#%d (1) {
[descriptor]=
resource(%d) of type (oci8 descriptor)
  }
}
string(72) this is a bg faaat test string. why are you reading it, I 
wonder? =)
bool(true)
string(40) this is a bg faaat test string. why 
bool(true)
string(30) this is a bg faaat test st
bool(true)
string(20) this is a bg faa
bool(true)
string(10) this is a 
bool(true)
string(0) 

Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in 
%s on line %d
bool(false)
Done
--UEXPECTF--
object(OCI-Lob)#%d (1) {
  [udescriptor]=
  resource(%d) of type (oci8 descriptor)
}
int(72)
array(2) {
  [0]=
  object(OCI-Lob)#%d (1) {
[udescriptor]=
resource(%d) of type (oci8 descriptor)
  }
  [uBLOB]=
  object(OCI-Lob)#%d (1) {
[udescriptor]=
resource(%d) of type (oci8 descriptor)
  }
}
string(72) this is a bg faaat test string. why are you reading it, I 
wonder? =)
bool(true)
string(40) this is a bg faaat test string. why 
bool(true)
string(30) this is a bg faaat test st
bool(true)
string(20) this is a bg faa
bool(true)
string(10) this is a 
bool(true)
string(0) 

Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in 
%s on line %d
bool(false)
Done

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

[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c

2006-12-11 Thread Antony Dovgal

tony2001Mon Dec 11 12:33:55 2006 UTC

  Modified files:  
/php-src/ext/oci8   oci8_interface.c 
  Log:
  prevent any possible problems with negative values
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.22 
php-src/ext/oci8/oci8_interface.c:1.23
--- php-src/ext/oci8/oci8_interface.c:1.22  Wed Dec  6 16:42:27 2006
+++ php-src/ext/oci8/oci8_interface.c   Mon Dec 11 12:33:55 2006
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_interface.c,v 1.22 2006/12/06 16:42:27 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.23 2006/12/11 12:33:55 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -623,7 +623,8 @@
 {
zval **tmp, *z_descriptor = getThis();
php_oci_descriptor *descriptor;
-   ub4 trim_length = 0;
+   long trim_length = 0;
+   ub4 ub_trim_length;

if (getThis()) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, 
trim_length) == FAILURE) {
@@ -640,10 +641,16 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find 
descriptor property);
RETURN_FALSE;
}
-   
+
+   if (trim_length  0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be 
greater than or equal to zero);
+   RETURN_FALSE;
+   }
+
+   ub_trim_length = (ub4) trim_length;
PHP_OCI_ZVAL_TO_DESCRIPTOR(*tmp, descriptor);

-   if (php_oci_lob_truncate(descriptor, trim_length TSRMLS_CC)) {
+   if (php_oci_lob_truncate(descriptor, ub_trim_length TSRMLS_CC)) {
RETURN_FALSE;
}
RETURN_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/oci8 oci8_interface.c

2006-12-11 Thread Antony Dovgal

tony2001Mon Dec 11 12:34:09 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/oci8   oci8_interface.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.4r2=1.8.2.7.2.5diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.4 
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.5
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.4   Fri Nov 10 23:03:32 2006
+++ php-src/ext/oci8/oci8_interface.c   Mon Dec 11 12:34:09 2006
@@ -25,7 +25,7 @@
+--+
 */
 
-/* $Id: oci8_interface.c,v 1.8.2.7.2.4 2006/11/10 23:03:32 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.5 2006/12/11 12:34:09 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -587,7 +587,8 @@
 {
zval **tmp, *z_descriptor = getThis();
php_oci_descriptor *descriptor;
-   ub4 trim_length = 0;
+   long trim_length = 0;
+   ub4 ub_trim_length;

if (getThis()) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |l, 
trim_length) == FAILURE) {
@@ -604,10 +605,16 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to find 
descriptor property);
RETURN_FALSE;
}
-   
+
+   if (trim_length  0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Length must be 
greater than or equal to zero);
+   RETURN_FALSE;
+   }
+
+   ub_trim_length = (ub4) trim_length;
PHP_OCI_ZVAL_TO_DESCRIPTOR(*tmp, descriptor);

-   if (php_oci_lob_truncate(descriptor, trim_length TSRMLS_CC)) {
+   if (php_oci_lob_truncate(descriptor, ub_trim_length TSRMLS_CC)) {
RETURN_FALSE;
}
RETURN_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) / NEWS /sapi/apache2filter php_functions.c /sapi/apache2handler php_functions.c

2006-12-11 Thread Ilia Alshanetsky

iliaa   Mon Dec 11 14:54:15 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/apache2handlerphp_functions.c 
/php-src/sapi/apache2filter php_functions.c 
/php-srcNEWS 
  Log:
  Fixed bug #39787 (PHP doesn't work with Apache 2.3).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6r2=1.18.2.6.2.1diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6 
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.1
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6Tue Jan  3 
20:13:07 2006
+++ php-src/sapi/apache2handler/php_functions.c Mon Dec 11 14:54:14 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.18.2.6 2006/01/03 20:13:07 iliaa Exp $ */
+/* $Id: php_functions.c,v 1.18.2.6.2.1 2006/12/11 14:54:14 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -333,7 +333,11 @@
 
 static char *php_apache_get_version()
 {
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
+   return (char *) ap_get_server_banner();
+#else
return (char *) ap_get_server_version();
+#endif
 }
 
 /* {{{ proto string apache_get_version(void)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2r2=1.44.2.2.2.1diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2 
php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.1
--- php-src/sapi/apache2filter/php_functions.c:1.44.2.2 Sun Jan  1 12:50:18 2006
+++ php-src/sapi/apache2filter/php_functions.c  Mon Dec 11 14:54:14 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.44.2.2 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_functions.c,v 1.44.2.2.2.1 2006/12/11 14:54:14 iliaa Exp $ */
 
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -289,7 +289,11 @@
 
 static char *php_apache_get_version()
 {
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
+   return (char *) ap_get_server_banner();
+#else
return (char *) ap_get_server_version();
+#endif
 }
 
 /* {{{ proto string apache_get_version(void)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.423r2=1.2027.2.547.2.424diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.423 php-src/NEWS:1.2027.2.547.2.424
--- php-src/NEWS:1.2027.2.547.2.423 Mon Dec 11 05:04:36 2006
+++ php-src/NEWSMon Dec 11 14:54:14 2006
@@ -52,6 +52,8 @@
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
 - Fixed bug #39791 (Crash in strtotime() on overly long relative date
   multipliers). (Ilia)
+- Fixed bug #39787 (PHP doesn't work with Apache 2.3). (mv at binarysec dot
+  com).
 - Fixed bug #39780 (PNG image with CRC/data error raises fatal error) (Pierre)
 - Fixed bug #39775 (Indirect modification ... message is not shown). (Dmitry)
 - Fixed bug #39763 (magic quotes are applied twice by ext/filter in

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

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

2006-12-11 Thread Ilia Alshanetsky

iliaa   Mon Dec 11 14:54:29 2006 UTC

  Modified files:  
/php-src/sapi/apache2handlerphp_functions.c 
/php-src/sapi/apache2filter php_functions.c 
  Log:
  MFB: Fixed bug #39787 (PHP doesn't work with Apache 2.3).
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.26r2=1.27diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.26 
php-src/sapi/apache2handler/php_functions.c:1.27
--- php-src/sapi/apache2handler/php_functions.c:1.26Sat Jun  3 11:19:44 2006
+++ php-src/sapi/apache2handler/php_functions.c Mon Dec 11 14:54:29 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.26 2006/06/03 11:19:44 mike Exp $ */
+/* $Id: php_functions.c,v 1.27 2006/12/11 14:54:29 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -333,7 +333,11 @@
 
 static char *php_apache_get_version()
 {
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
+   return (char *) ap_get_server_banner();
+#else
return (char *) ap_get_server_version();
+#endif
 }
 
 /* {{{ proto string apache_get_version(void)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.46r2=1.47diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.46 
php-src/sapi/apache2filter/php_functions.c:1.47
--- php-src/sapi/apache2filter/php_functions.c:1.46 Sun Jan  1 13:09:57 2006
+++ php-src/sapi/apache2filter/php_functions.c  Mon Dec 11 14:54:29 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.46 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_functions.c,v 1.47 2006/12/11 14:54:29 iliaa Exp $ */
 
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -289,7 +289,11 @@
 
 static char *php_apache_get_version()
 {
+#if MODULE_MAGIC_NUMBER_MAJOR = 20060905
+   return (char *) ap_get_server_banner();
+#else
return (char *) ap_get_server_version();
+#endif
 }
 
 /* {{{ proto string apache_get_version(void)

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

Re: [PHP-CVS] cvs: php-src /ext/standard credits.c info.c /main output.c php_output.h

2006-12-11 Thread Andrei Zmievski


So, we'll keep author names in Credits in Latin-1? Why not use UTF-8?

-Andrei

On Dec 10, 2006, at 7:02 AM, Michael Wallner wrote:


mikeSun Dec 10 15:02:51 2006 UTC

  Modified files:
/php-src/main   output.c php_output.h
/php-src/ext/standard   info.c credits.c
  Log:
  - upgrade phpinfo() and phpcredits()

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


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

Re: [PHP-CVS] cvs: php-src /ext/pdo config.m4 pdo.c pdo_dbh.c pdo_sql_parser.c pdo_sqlstate.c pdo_stmt.c php_pdo.h php_pdo_driver.h php_pdo_int.h php_pdo_phpvers_compat.h

2006-12-11 Thread Andrei Zmievski

Thanks, Wez! Looking forward to next installment of PDO in Unicode 
Land.


-Andrei

On Dec 9, 2006, at 2:18 PM, Wez Furlong wrote:


wez Sat Dec  9 22:18:43 2006 UTC

  Modified files:
/php-src/ext/pdoconfig.m4 pdo.c pdo_dbh.c pdo_sql_parser.c
pdo_sqlstate.c pdo_stmt.c php_pdo.h
php_pdo_driver.h php_pdo_int.h
php_pdo_phpvers_compat.h
  Log:
  merge PHP 5 pdo into HEAD.  This source compiles on both PHP 5 and 
PHP 6.
  If you're poking around in here, please make sure that any changes 
you make

  compile on both PHP 5 and 6.  Thanks!


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


--
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) / NEWS /ext/date php_date.c /ext/date/tests bug39782.phpt

2006-12-11 Thread Ilia Alshanetsky

iliaa   Mon Dec 11 21:04:40 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/date/tests bug39782.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/date   php_date.c 
  Log:
  Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday  
  yields incorrect results).
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.424r2=1.2027.2.547.2.425diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.424 php-src/NEWS:1.2027.2.547.2.425
--- php-src/NEWS:1.2027.2.547.2.424 Mon Dec 11 14:54:14 2006
+++ php-src/NEWSMon Dec 11 21:04:40 2006
@@ -54,6 +54,8 @@
   multipliers). (Ilia)
 - Fixed bug #39787 (PHP doesn't work with Apache 2.3). (mv at binarysec dot
   com).
+- Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday
+  yields incorrect results). (Ilia)
 - Fixed bug #39780 (PNG image with CRC/data error raises fatal error) (Pierre)
 - Fixed bug #39775 (Indirect modification ... message is not shown). (Dmitry)
 - Fixed bug #39763 (magic quotes are applied twice by ext/filter in
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.34r2=1.43.2.45.2.35diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.34 
php-src/ext/date/php_date.c:1.43.2.45.2.35
--- php-src/ext/date/php_date.c:1.43.2.45.2.34  Mon Nov  6 16:11:26 2006
+++ php-src/ext/date/php_date.c Mon Dec 11 21:04:40 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.45.2.34 2006/11/06 16:11:26 bjori Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.35 2006/12/11 21:04:40 iliaa Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1643,6 +1643,8 @@
timelib_fill_holes(dateobj-time, now, 0);
timelib_update_ts(dateobj-time, tzi);
 
+   dateobj-time-have_weekday_relative = dateobj-time-have_relative = 0;
+
if (now-tz_info != tzi) {
timelib_tzinfo_dtor(now-tz_info);
}

http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug39782.phpt?view=markuprev=1.1
Index: php-src/ext/date/tests/bug39782.phpt
+++ php-src/ext/date/tests/bug39782.phpt

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

[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug39782.phpt

2006-12-11 Thread Ilia Alshanetsky

iliaa   Mon Dec 11 21:08:45 2006 UTC

  Modified files:  
/php-src/ext/date/tests bug39782.phpt 
/php-src/ext/date   php_date.c 
  Log:
  MFB: Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday 
 
  yields incorrect results). 
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug39782.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/date/tests/bug39782.phpt
diff -u /dev/null php-src/ext/date/tests/bug39782.phpt:1.2
--- /dev/null   Mon Dec 11 21:08:45 2006
+++ php-src/ext/date/tests/bug39782.phptMon Dec 11 21:08:44 2006
@@ -0,0 +1,19 @@
+--TEST--
+Bug #39782 (setTime() on a DateTime constructed with a Weekday yields 
incorrect results)
+--FILE--
+?php
+date_default_timezone_set(GMT);
+
+$dttTest = new DateTime('Dec 10 2006 Next Wednesday');
+echo $dttTest-format('D M j Y - H:i:s') . \n;
+
+$dttTest-setTime(12, 0, 0);
+echo $dttTest-format('D M j Y - H:i:s') . \n;
+
+$dttTest-setTime(12, 0, 0);
+echo $dttTest-format('D M j Y - H:i:s') . \n;
+?
+--EXPECT--
+Wed Dec 13 2006 - 00:00:00
+Wed Dec 13 2006 - 12:00:00
+Wed Dec 13 2006 - 12:00:00
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.125r2=1.126diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.125 php-src/ext/date/php_date.c:1.126
--- php-src/ext/date/php_date.c:1.125   Mon Nov  6 16:10:33 2006
+++ php-src/ext/date/php_date.c Mon Dec 11 21:08:44 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.125 2006/11/06 16:10:33 bjori Exp $ */
+/* $Id: php_date.c,v 1.126 2006/12/11 21:08:44 iliaa Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1771,6 +1771,7 @@
timelib_fill_holes(dateobj-time, now, 0);
timelib_update_ts(dateobj-time, tzi);
 
+   dateobj-time-have_weekday_relative = dateobj-time-have_relative = 0;
if (now-tz_info != tzi) {
timelib_tzinfo_dtor(now-tz_info);
}

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

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/standard crypt.c

2006-12-11 Thread Antony Dovgal

tony2001Tue Dec 12 07:36:37 2006 UTC

  Modified files:  
/php-src/ext/standard   crypt.c 
/php-srcconfigure.in acinclude.m4 
  Log:
  fix #39795 (build fails on AIX because crypt_r() uses different data struct)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.66r2=1.67diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.66 php-src/ext/standard/crypt.c:1.67
--- php-src/ext/standard/crypt.c:1.66   Sun Dec  3 13:46:09 2006
+++ php-src/ext/standard/crypt.cTue Dec 12 07:36:36 2006
@@ -17,7 +17,7 @@
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
  */
-/* $Id: crypt.c,v 1.66 2006/12/03 13:46:09 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.67 2006/12/12 07:36:36 tony2001 Exp $ */
 #include stdlib.h
 
 #include php.h
@@ -28,6 +28,9 @@
 #include unistd.h
 #endif
 #if HAVE_CRYPT_H
+#if defined(CRYPT_R_GNU_SOURCE)  !defined(_GNU_SOURCE)
+#define _GNU_SOURCE
+#endif
 #include crypt.h
 #endif
 #if TM_IN_SYS_TIME
@@ -147,8 +150,15 @@
}
 #ifdef HAVE_CRYPT_R
{
+#if defined(CRYPT_R_STRUCT_CRYPT_DATA)
struct crypt_data buffer;
memset(buffer, 0, sizeof(buffer));
+#elif defined(CRYPT_R_CRYPTD)
+   CRYPTD buffer;
+#else 
+#error Data struct used by crypt_r() is unknown. Please report.
+#endif
+
RETURN_STRING(crypt_r(str, salt, buffer), 1);
}
 #else
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.617r2=1.618diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.617 php-src/configure.in:1.618
--- php-src/configure.in:1.617  Tue Dec  5 08:08:33 2006
+++ php-src/configure.inTue Dec 12 07:36:37 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.617 2006/12/05 08:08:33 dmitry Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.618 2006/12/12 07:36:37 tony2001 Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -465,7 +465,6 @@
 ctime_r \
 cuserid \
 crypt \
-crypt_r \
 flock \
 ftok \
 funopen \
@@ -598,6 +597,11 @@
 PHP_READDIR_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
+AC_CHECK_FUNCS(crypt_r, [ php_crypt_r=1 ], [ php_crypt_r=0 ])
+if test x$php_crypt_r = x1; then
+  PHP_CRYPT_R_STYLE
+fi
+
 divert(4)
 
 dnl ## In diversion 4 we check user-configurable general settings.
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.351r2=1.352diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.351 php-src/acinclude.m4:1.352
--- php-src/acinclude.m4:1.351  Mon Dec  4 18:28:34 2006
+++ php-src/acinclude.m4Tue Dec 12 07:36:37 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.351 2006/12/04 18:28:34 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.352 2006/12/12 07:36:37 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2590,3 +2590,55 @@
   )
 ])
 
+dnl
+dnl PHP_CRYPT_R_STYLE
+dnl detect the style of crypt_r() is any is available
+dnl see APR_CHECK_CRYPT_R_STYLE() for original version
+dnl
+AC_DEFUN([PHP_CRYPT_R_STYLE],
+[
+  AC_CACHE_CHECK([which data struct is used by crypt_r], php_cv_crypt_r_style,[
+php_cv_crypt_r_style=none
+AC_TRY_COMPILE([
+#include crypt.h
+],[
+CRYPTD buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=cryptd)
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data)
+fi
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data_gnu_source)
+fi
+])
+
+  if test $php_cv_crypt_r_style = cryptd; then
+AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data -o 
$php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_STRUCT_CRYPT_DATA, 1, [Define if crypt_r uses struct 
crypt_data])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_GNU_SOURCE, 1, [Define if struct crypt_data requires 
_GNU_SOURCE])
+  fi
+  if test $php_cv_crypt_r_style = none; then
+AC_MSG_ERROR([Unable to detect data struct is used by crypt_r])
+  fi
+])

-- 
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) / NEWS acinclude.m4 configure.in /ext/standard crypt.c

2006-12-11 Thread Antony Dovgal

tony2001Tue Dec 12 07:38:04 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS configure.in acinclude.m4 
/php-src/ext/standard   crypt.c 
  Log:
  MFH: fix #39795 (build fails on AIX because crypt_r() uses different data 
struct)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.425r2=1.2027.2.547.2.426diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.425 php-src/NEWS:1.2027.2.547.2.426
--- php-src/NEWS:1.2027.2.547.2.425 Mon Dec 11 21:04:40 2006
+++ php-src/NEWSTue Dec 12 07:38:04 2006
@@ -50,6 +50,8 @@
 - Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
 - Fixed wrong signature initialization in imagepng (Takeshi Abe)
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39795 (build fails on AIX because crypt_r() uses different data 
+  struct). (Tony)
 - Fixed bug #39791 (Crash in strtotime() on overly long relative date
   multipliers). (Ilia)
 - Fixed bug #39787 (PHP doesn't work with Apache 2.3). (mv at binarysec dot
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.29r2=1.579.2.52.2.30diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.29 
php-src/configure.in:1.579.2.52.2.30
--- php-src/configure.in:1.579.2.52.2.29Tue Dec  5 08:07:56 2006
+++ php-src/configure.inTue Dec 12 07:38:04 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.52.2.29 2006/12/05 08:07:56 dmitry Exp $ -*- 
autoconf -*-
+ ## $Id: configure.in,v 1.579.2.52.2.30 2006/12/12 07:38:04 tony2001 Exp $ -*- 
autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -467,7 +467,6 @@
 ctime_r \
 cuserid \
 crypt \
-crypt_r \
 flock \
 ftok \
 funopen \
@@ -600,6 +599,11 @@
 PHP_READDIR_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
+AC_CHECK_FUNCS(crypt_r, [ php_crypt_r=1 ], [ php_crypt_r=0 ])
+if test x$php_crypt_r = x1; then
+  PHP_CRYPT_R_STYLE
+fi
+
 divert(4)
 
 dnl ## In diversion 4 we check user-configurable general settings.
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.6r2=1.332.2.14.2.7diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.332.2.14.2.6 php-src/acinclude.m4:1.332.2.14.2.7
--- php-src/acinclude.m4:1.332.2.14.2.6 Mon Dec  4 18:28:49 2006
+++ php-src/acinclude.m4Tue Dec 12 07:38:04 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.332.2.14.2.6 2006/12/04 18:28:49 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.332.2.14.2.7 2006/12/12 07:38:04 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2590,3 +2590,55 @@
   )
 ])
 
+dnl
+dnl PHP_CRYPT_R_STYLE
+dnl detect the style of crypt_r() is any is available
+dnl see APR_CHECK_CRYPT_R_STYLE() for original version
+dnl
+AC_DEFUN([PHP_CRYPT_R_STYLE],
+[
+  AC_CACHE_CHECK([which data struct is used by crypt_r], php_cv_crypt_r_style,[
+php_cv_crypt_r_style=none
+AC_TRY_COMPILE([
+#include crypt.h
+],[
+CRYPTD buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=cryptd)
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data)
+fi
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data_gnu_source)
+fi
+])
+
+  if test $php_cv_crypt_r_style = cryptd; then
+AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data -o 
$php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_STRUCT_CRYPT_DATA, 1, [Define if crypt_r uses struct 
crypt_data])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_GNU_SOURCE, 1, [Define if struct crypt_data requires 
_GNU_SOURCE])
+  fi
+  if test $php_cv_crypt_r_style = none; then
+AC_MSG_ERROR([Unable to detect data struct is used by crypt_r])
+  fi
+])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.62.2.1.2.2r2=1.62.2.1.2.3diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.62.2.1.2.2 
php-src/ext/standard/crypt.c:1.62.2.1.2.3
--- php-src/ext/standard/crypt.c:1.62.2.1.2.2   Sun Dec  3 13:46:37 2006
+++ php-src/ext/standard/crypt.cTue Dec 12 07:38:04 2006
@@ -17,7 +17,7 @@
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
  */
-/* $Id: crypt.c,v 1.62.2.1.2.2 2006/12/03 13:46:37 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.62.2.1.2.3 2006/12/12 07:38:04 tony2001 Exp $ */
 #include stdlib.h
 
 #include php.h
@@ -28,6 +28,9 @@
 #include unistd.h
 #endif
 #if HAVE_CRYPT_H
+#if

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

[PHP-CVS] cvs: php-src /ext/oci8/tests lob_027.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8/tests lob_027.phpt

[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_interface.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/apache2filter php_functions.c /sapi/apache2handler php_functions.c

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

Re: [PHP-CVS] cvs: php-src /ext/standard credits.c info.c /main output.c php_output.h

Re: [PHP-CVS] cvs: php-src /ext/pdo config.m4 pdo.c pdo_dbh.c pdo_sql_parser.c pdo_sqlstate.c pdo_stmt.c php_pdo.h php_pdo_driver.h php_pdo_int.h php_pdo_phpvers_compat.h

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c /ext/date/tests bug39782.phpt

[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/date/tests bug39782.phpt

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/standard crypt.c

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS acinclude.m4 configure.in /ext/standard crypt.c

13 matches

Site Navigation

Mail list logo

Footer information