date:20071105

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2007-11-05 Thread changelog

changelog   Tue Nov  6 01:31:30 2007 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2859r2=1.2860diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2859 php-src/ChangeLog:1.2860
--- php-src/ChangeLog:1.2859Mon Nov  5 01:31:37 2007
+++ php-src/ChangeLog   Tue Nov  6 01:31:29 2007
@@ -1,3 +1,354 @@
+2007-11-05  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/standard/array.c:
+  MFB: Fixed bug #43197 (array_intersect_assoc() does not emit warning
+  messages for error inputs)
+
+* (PHP_5_3)
+  ext/standard/array.c:
+  Fixed bug #43197 (array_intersect_assoc() does not emit warning messages
+  for
+  error inputs)
+
+2007-11-05  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/standard/file.c:
+  MFH: Sync
+  [DOC]: note
+  [DOC] -/* {{{ proto bool copy(string source_file, string 
destination_file)
+  [DOC] +/* {{{ proto bool copy(string source_file, string destination_file
+  [, resource context])
+  [DOC]
+  [DOC] Apparently this was undocumented so far anyway..
+
+* ext/standard/tests/file/tempnam_variation7.phpt:
+  - Fix another wrong expected result (this is a bug!)
+
+* ext/standard/tests/file/tempnam_variation3.phpt:
+  - Fix another wrong expected result
+
+* ext/standard/tests/file/flock_error.phpt:
+  - Fix expected result. This has hidden an obvious bug..
+
+2007-11-05  Raghubansh Kumar  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/standard/tests/array/asort_basic.phpt
+  ext/standard/tests/array/asort_basic.phpt
+  ext/standard/tests/array/asort_error.phpt
+  ext/standard/tests/array/asort_error.phpt
+  ext/standard/tests/array/asort_object1.phpt
+  ext/standard/tests/array/asort_object1.phpt
+  ext/standard/tests/array/asort_object2.phpt
+  ext/standard/tests/array/asort_object2.phpt
+  ext/standard/tests/array/asort_variation1.phpt
+  ext/standard/tests/array/asort_variation1.phpt
+  ext/standard/tests/array/asort_variation10.phpt
+  ext/standard/tests/array/asort_variation10.phpt
+  ext/standard/tests/array/asort_variation11.phpt
+  ext/standard/tests/array/asort_variation11.phpt
+  ext/standard/tests/array/asort_variation2.phpt
+  ext/standard/tests/array/asort_variation2.phpt
+  ext/standard/tests/array/asort_variation3.phpt
+  ext/standard/tests/array/asort_variation3.phpt
+  ext/standard/tests/array/asort_variation4.phpt
+  ext/standard/tests/array/asort_variation4.phpt
+  ext/standard/tests/array/asort_variation5.phpt
+  ext/standard/tests/array/asort_variation5.phpt
+  ext/standard/tests/array/asort_variation6.phpt
+  ext/standard/tests/array/asort_variation6.phpt
+  ext/standard/tests/array/asort_variation7.phpt
+  ext/standard/tests/array/asort_variation7.phpt
+  ext/standard/tests/array/asort_variation8.phpt
+  ext/standard/tests/array/asort_variation8.phpt
+  ext/standard/tests/array/asort_variation9.phpt
+  ext/standard/tests/array/asort_variation9.phpt:
+  New testcases for asort() function
+
+* ext/standard/tests/array/asort_basic.phpt
+  ext/standard/tests/array/asort_basic.phpt
+  ext/standard/tests/array/asort_basic.phpt
+  ext/standard/tests/array/asort_error.phpt
+  ext/standard/tests/array/asort_error.phpt
+  ext/standard/tests/array/asort_error.phpt
+  ext/standard/tests/array/asort_object1.phpt
+  ext/standard/tests/array/asort_object1.phpt
+  ext/standard/tests/array/asort_object1.phpt
+  ext/standard/tests/array/asort_object2.phpt
+  ext/standard/tests/array/asort_object2.phpt
+  ext/standard/tests/array/asort_object2.phpt
+  ext/standard/tests/array/asort_variation1.phpt
+  ext/standard/tests/array/asort_variation1.phpt
+  ext/standard/tests/array/asort_variation1.phpt
+  ext/standard/tests/array/asort_variation10.phpt
+  ext/standard/tests/array/asort_variation10.phpt
+  ext/standard/tests/array/asort_variation10.phpt
+  ext/standard/tests/array/asort_variation11.phpt
+  ext/standard/tests/array/asort_variation11.phpt
+  ext/standard/tests/array/asort_variation11.phpt
+  ext/standard/tests/array/asort_variation2.phpt
+  ext/standard/tests/array/asort_variation2.phpt
+  ext/standard/tests/array/asort_variation2.phpt
+  ext/standard/tests/array/asort_variation3.phpt
+  ext/standard/tests/array/asort_variation3.phpt
+  ext/standard/tests/array/asort_variation3.phpt
+  ext/standard/tests/array/asort_variation4.phpt
+  ext/standard/tests/array/asort_variation4.phpt
+  ext/standard/tests/array/asort_variation4.phpt
+  ext/standard/tests/array/asort_variation5.phpt
+  ext/standard/tests/array/asort_variation5.phpt
+  ext/standard/tests/array/asort_variation5.phpt
+

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

2007-11-05 Thread changelog

changelog   Tue Nov  6 01:31:32 2007 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1191r2=1.1192diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1191 ZendEngine2/ChangeLog:1.1192
--- ZendEngine2/ChangeLog:1.1191Sat Nov  3 01:33:33 2007
+++ ZendEngine2/ChangeLog   Tue Nov  6 01:31:31 2007
@@ -1,3 +1,9 @@
+2007-11-05  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend_API.c:
+  - Fix confusing logic (sync with HEAD)
+
 2007-11-02  Jani Taskinen  [EMAIL PROTECTED]
 
 * (PHP_5_3)
@@ -19790,7 +19796,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1191 2007/11/03 01:33:33 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1192 2007/11/06 01:31:31 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -21514,7 +21520,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1191 2007/11/03 01:33:33 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1192 2007/11/06 01:31:31 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h

2007-11-05 Thread Derick Rethans

derick  Mon Nov  5 09:24:18 2007 UTC

  Modified files:  
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2007.9
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.21r2=1.22diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.21 
php-src/ext/date/lib/timezonedb.h:1.22
--- php-src/ext/date/lib/timezonedb.h:1.21  Thu Oct 11 18:35:04 2007
+++ php-src/ext/date/lib/timezonedb.h   Mon Nov  5 09:24:17 2007
@@ -3132,22 +3132,22 @@
 0x36, 0xFD, 0xB7, 0x50, 0x38, 0x1B, 0xCC, 0xD0, 0x38, 0xE6, 0xD3, 0xD0, 0x39, 
0xFB, 0xAE, 0xD0, 
 0x3A, 0xC6, 0xB5, 0xD0, 0x3B, 0xDB, 0x90, 0xD0, 0x3C, 0xAF, 0xD2, 0x50, 0x3D, 
0xBB, 0x72, 0xD0, 
 0x3E, 0x8F, 0xB4, 0x50, 0x3F, 0x9B, 0x54, 0xD0, 0x40, 0x6F, 0x96, 0x50, 0x45, 
0x44, 0x35, 0x50, 
-0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x2D, 0x51, 0xD0, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x0D, 0x33, 0xD0, 
-0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xED, 0x15, 0xD0, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xD6, 0x32, 0x50, 
-0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xB6, 0x14, 0x50, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x95, 0xF6, 0x50, 
-0x51, 0x3C, 0x13, 0x50, 0x52, 0x75, 0xD8, 0x50, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x55, 0xBA, 0x50, 
-0x54, 0xFB, 0xD7, 0x50, 0x56, 0x35, 0x9C, 0x50, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x1E, 0xB8, 0xD0, 
-0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xFE, 0x9A, 0xD0, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xDE, 0x7C, 0xD0, 
-0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xBE, 0x5E, 0xD0, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x9E, 0x40, 0xD0, 
-0x60, 0x4D, 0x98, 0x50, 0x61, 0x87, 0x5D, 0x50, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x67, 0x3F, 0x50, 
-0x64, 0x0D, 0x5C, 0x50, 0x65, 0x47, 0x21, 0x50, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x27, 0x03, 0x50, 
-0x67, 0xCD, 0x20, 0x50, 0x69, 0x06, 0xE5, 0x50, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xE6, 0xC7, 0x50, 
-0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xAF, 0xC5, 0xD0, 
-0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x6F, 0x89, 0xD0, 
-0x73, 0x15, 0xA6, 0xD0, 0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x38, 0x88, 0x50, 
-0x76, 0xDE, 0xA5, 0x50, 0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xF8, 0x4C, 0x50, 
-0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xB8, 0x10, 0x50, 
-0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x97, 0xF2, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
+0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x24, 0x17, 0x50, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x03, 0xF9, 0x50, 
+0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xE3, 0xDB, 0x50, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xCC, 0xF7, 0xD0, 
+0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xAC, 0xD9, 0xD0, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x8C, 0xBB, 0xD0, 
+0x51, 0x3C, 0x13, 0x50, 0x52, 0x6C, 0x9D, 0xD0, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x4C, 0x7F, 0xD0, 
+0x54, 0xFB, 0xD7, 0x50, 0x56, 0x2C, 0x61, 0xD0, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x15, 0x7E, 0x50, 
+0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xF5, 0x60, 0x50, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xD5, 0x42, 0x50, 
+0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xB5, 0x24, 0x50, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x95, 0x06, 0x50, 
+0x60, 0x4D, 0x98, 0x50, 0x61, 0x7E, 0x22, 0xD0, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x5E, 0x04, 0xD0, 
+0x64, 0x0D, 0x5C, 0x50, 0x65, 0x3D, 0xE6, 0xD0, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x1D, 0xC8, 0xD0, 
+0x67, 0xCD, 0x20, 0x50, 0x68, 0xFD, 0xAA, 0xD0, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xDD, 0x8C, 0xD0, 
+0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xC6, 0xA9, 0x50, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xA6, 0x8B, 0x50, 
+0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x86, 0x6D, 0x50, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x66, 0x4F, 0x50, 
+0x73, 0x15, 0xA6, 0xD0, 0x74, 0x46, 0x31, 0x50, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x2F, 0x4D, 0xD0, 
+0x76, 0xDE, 0xA5, 0x50, 0x78, 0x0F, 0x2F, 0xD0, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xEF, 0x11, 0xD0, 
+0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xCE, 0xF3, 0xD0, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xAE, 0xD5, 0xD0, 
+0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x8E, 0xB7, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -7028,22 +7028,22 @@
 0x3A, 0xC6, 0x53, 0x60, 0x3B, 0xB7, 0x87, 0xD0, 0x3C, 0xA7, 0x86, 0xE0, 0x3D, 
0x98, 0xBB, 0x50, 
 0x3E, 0x88, 0xBA, 0x60, 0x3F, 0x79, 0xEE, 0xD0, 0x40, 0x6B, 0x3F, 0x60, 0x41, 
0x5C, 0x73, 0xD0, 
 0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3D, 0xA7, 0x50, 0x44, 0x2D, 0xA6, 0x60, 0x45, 
0x12, 0xFD, 0x50, 
-0x46, 0x0C, 0x36, 0xE0, 0x47, 0x00, 0x0E, 0x50, 0x47, 0xEC, 0x18, 0xE0, 0x48, 
0xE2, 0x93, 0x50, 
-0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xC3, 0xC6, 0xD0, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 
0xA4, 0xFA, 0x50, 
-0x4D, 0x8B, 0xBE, 0xE0, 0x4E, 0x86, 0x2D, 0xD0, 0x4F, 0x74, 0xDB, 0x60, 0x50, 
0x68, 0xB2, 0xD0, 
-0x51, 0x54, 0xBD, 0x60, 0x52, 0x49, 0xE6, 0x50, 0x53, 0x34, 0x9F, 0x60,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib timezonedb.h

2007-11-05 Thread Derick Rethans

derick  Mon Nov  5 09:38:53 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2007.9
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.10.2.1r2=1.4.2.7.2.10.2.2diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.1 
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.2
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.1  Thu Oct 11 18:54:13 2007
+++ php-src/ext/date/lib/timezonedb.h   Mon Nov  5 09:38:51 2007
@@ -3132,22 +3132,22 @@
 0x36, 0xFD, 0xB7, 0x50, 0x38, 0x1B, 0xCC, 0xD0, 0x38, 0xE6, 0xD3, 0xD0, 0x39, 
0xFB, 0xAE, 0xD0, 
 0x3A, 0xC6, 0xB5, 0xD0, 0x3B, 0xDB, 0x90, 0xD0, 0x3C, 0xAF, 0xD2, 0x50, 0x3D, 
0xBB, 0x72, 0xD0, 
 0x3E, 0x8F, 0xB4, 0x50, 0x3F, 0x9B, 0x54, 0xD0, 0x40, 0x6F, 0x96, 0x50, 0x45, 
0x44, 0x35, 0x50, 
-0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x2D, 0x51, 0xD0, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x0D, 0x33, 0xD0, 
-0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xED, 0x15, 0xD0, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xD6, 0x32, 0x50, 
-0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xB6, 0x14, 0x50, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x95, 0xF6, 0x50, 
-0x51, 0x3C, 0x13, 0x50, 0x52, 0x75, 0xD8, 0x50, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x55, 0xBA, 0x50, 
-0x54, 0xFB, 0xD7, 0x50, 0x56, 0x35, 0x9C, 0x50, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x1E, 0xB8, 0xD0, 
-0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xFE, 0x9A, 0xD0, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xDE, 0x7C, 0xD0, 
-0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xBE, 0x5E, 0xD0, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x9E, 0x40, 0xD0, 
-0x60, 0x4D, 0x98, 0x50, 0x61, 0x87, 0x5D, 0x50, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x67, 0x3F, 0x50, 
-0x64, 0x0D, 0x5C, 0x50, 0x65, 0x47, 0x21, 0x50, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x27, 0x03, 0x50, 
-0x67, 0xCD, 0x20, 0x50, 0x69, 0x06, 0xE5, 0x50, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xE6, 0xC7, 0x50, 
-0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xAF, 0xC5, 0xD0, 
-0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x6F, 0x89, 0xD0, 
-0x73, 0x15, 0xA6, 0xD0, 0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x38, 0x88, 0x50, 
-0x76, 0xDE, 0xA5, 0x50, 0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xF8, 0x4C, 0x50, 
-0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xB8, 0x10, 0x50, 
-0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x97, 0xF2, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
+0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x24, 0x17, 0x50, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x03, 0xF9, 0x50, 
+0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xE3, 0xDB, 0x50, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xCC, 0xF7, 0xD0, 
+0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xAC, 0xD9, 0xD0, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x8C, 0xBB, 0xD0, 
+0x51, 0x3C, 0x13, 0x50, 0x52, 0x6C, 0x9D, 0xD0, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x4C, 0x7F, 0xD0, 
+0x54, 0xFB, 0xD7, 0x50, 0x56, 0x2C, 0x61, 0xD0, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x15, 0x7E, 0x50, 
+0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xF5, 0x60, 0x50, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xD5, 0x42, 0x50, 
+0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xB5, 0x24, 0x50, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x95, 0x06, 0x50, 
+0x60, 0x4D, 0x98, 0x50, 0x61, 0x7E, 0x22, 0xD0, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x5E, 0x04, 0xD0, 
+0x64, 0x0D, 0x5C, 0x50, 0x65, 0x3D, 0xE6, 0xD0, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x1D, 0xC8, 0xD0, 
+0x67, 0xCD, 0x20, 0x50, 0x68, 0xFD, 0xAA, 0xD0, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xDD, 0x8C, 0xD0, 
+0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xC6, 0xA9, 0x50, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xA6, 0x8B, 0x50, 
+0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x86, 0x6D, 0x50, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x66, 0x4F, 0x50, 
+0x73, 0x15, 0xA6, 0xD0, 0x74, 0x46, 0x31, 0x50, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x2F, 0x4D, 0xD0, 
+0x76, 0xDE, 0xA5, 0x50, 0x78, 0x0F, 0x2F, 0xD0, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xEF, 0x11, 0xD0, 
+0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xCE, 0xF3, 0xD0, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xAE, 0xD5, 0xD0, 
+0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x8E, 0xB7, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -7028,22 +7028,22 @@
 0x3A, 0xC6, 0x53, 0x60, 0x3B, 0xB7, 0x87, 0xD0, 0x3C, 0xA7, 0x86, 0xE0, 0x3D, 
0x98, 0xBB, 0x50, 
 0x3E, 0x88, 0xBA, 0x60, 0x3F, 0x79, 0xEE, 0xD0, 0x40, 0x6B, 0x3F, 0x60, 0x41, 
0x5C, 0x73, 0xD0, 
 0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3D, 0xA7, 0x50, 0x44, 0x2D, 0xA6, 0x60, 0x45, 
0x12, 0xFD, 0x50, 
-0x46, 0x0C, 0x36, 0xE0, 0x47, 0x00, 0x0E, 0x50, 0x47, 0xEC, 0x18, 0xE0, 0x48, 
0xE2, 0x93, 0x50, 
-0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xC3, 0xC6, 0xD0, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 
0xA4, 0xFA, 0x50, 
-0x4D, 0x8B, 0xBE, 0xE0, 0x4E, 0x86, 0x2D, 0xD0, 0x4F, 0x74, 0xDB, 0x60, 0x50, 
0x68, 0xB2, 0xD0,

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib timezonedb.h

2007-11-05 Thread Derick Rethans

derick  Mon Nov  5 10:36:52 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2007.9
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.11r2=1.4.2.7.2.12diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.11 
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.12
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.11  Thu Oct 11 18:54:37 2007
+++ php-src/ext/date/lib/timezonedb.h   Mon Nov  5 10:36:50 2007
@@ -3132,22 +3132,22 @@
 0x36, 0xFD, 0xB7, 0x50, 0x38, 0x1B, 0xCC, 0xD0, 0x38, 0xE6, 0xD3, 0xD0, 0x39, 
0xFB, 0xAE, 0xD0, 
 0x3A, 0xC6, 0xB5, 0xD0, 0x3B, 0xDB, 0x90, 0xD0, 0x3C, 0xAF, 0xD2, 0x50, 0x3D, 
0xBB, 0x72, 0xD0, 
 0x3E, 0x8F, 0xB4, 0x50, 0x3F, 0x9B, 0x54, 0xD0, 0x40, 0x6F, 0x96, 0x50, 0x45, 
0x44, 0x35, 0x50, 
-0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x2D, 0x51, 0xD0, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x0D, 0x33, 0xD0, 
-0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xED, 0x15, 0xD0, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xD6, 0x32, 0x50, 
-0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xB6, 0x14, 0x50, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x95, 0xF6, 0x50, 
-0x51, 0x3C, 0x13, 0x50, 0x52, 0x75, 0xD8, 0x50, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x55, 0xBA, 0x50, 
-0x54, 0xFB, 0xD7, 0x50, 0x56, 0x35, 0x9C, 0x50, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x1E, 0xB8, 0xD0, 
-0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xFE, 0x9A, 0xD0, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xDE, 0x7C, 0xD0, 
-0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xBE, 0x5E, 0xD0, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x9E, 0x40, 0xD0, 
-0x60, 0x4D, 0x98, 0x50, 0x61, 0x87, 0x5D, 0x50, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x67, 0x3F, 0x50, 
-0x64, 0x0D, 0x5C, 0x50, 0x65, 0x47, 0x21, 0x50, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x27, 0x03, 0x50, 
-0x67, 0xCD, 0x20, 0x50, 0x69, 0x06, 0xE5, 0x50, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xE6, 0xC7, 0x50, 
-0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xCF, 0xE3, 0xD0, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xAF, 0xC5, 0xD0, 
-0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x8F, 0xA7, 0xD0, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x6F, 0x89, 0xD0, 
-0x73, 0x15, 0xA6, 0xD0, 0x74, 0x4F, 0x6B, 0xD0, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x38, 0x88, 0x50, 
-0x76, 0xDE, 0xA5, 0x50, 0x78, 0x18, 0x6A, 0x50, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xF8, 0x4C, 0x50, 
-0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xD8, 0x2E, 0x50, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xB8, 0x10, 0x50, 
-0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x97, 0xF2, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
+0x45, 0xF3, 0x8C, 0xD0, 0x47, 0x24, 0x17, 0x50, 0x47, 0xD3, 0x6E, 0xD0, 0x49, 
0x03, 0xF9, 0x50, 
+0x49, 0xB3, 0x50, 0xD0, 0x4A, 0xE3, 0xDB, 0x50, 0x4B, 0x9C, 0x6D, 0x50, 0x4C, 
0xCC, 0xF7, 0xD0, 
+0x4D, 0x7C, 0x4F, 0x50, 0x4E, 0xAC, 0xD9, 0xD0, 0x4F, 0x5C, 0x31, 0x50, 0x50, 
0x8C, 0xBB, 0xD0, 
+0x51, 0x3C, 0x13, 0x50, 0x52, 0x6C, 0x9D, 0xD0, 0x53, 0x1B, 0xF5, 0x50, 0x54, 
0x4C, 0x7F, 0xD0, 
+0x54, 0xFB, 0xD7, 0x50, 0x56, 0x2C, 0x61, 0xD0, 0x56, 0xE4, 0xF3, 0xD0, 0x58, 
0x15, 0x7E, 0x50, 
+0x58, 0xC4, 0xD5, 0xD0, 0x59, 0xF5, 0x60, 0x50, 0x5A, 0xA4, 0xB7, 0xD0, 0x5B, 
0xD5, 0x42, 0x50, 
+0x5C, 0x84, 0x99, 0xD0, 0x5D, 0xB5, 0x24, 0x50, 0x5E, 0x64, 0x7B, 0xD0, 0x5F, 
0x95, 0x06, 0x50, 
+0x60, 0x4D, 0x98, 0x50, 0x61, 0x7E, 0x22, 0xD0, 0x62, 0x2D, 0x7A, 0x50, 0x63, 
0x5E, 0x04, 0xD0, 
+0x64, 0x0D, 0x5C, 0x50, 0x65, 0x3D, 0xE6, 0xD0, 0x65, 0xED, 0x3E, 0x50, 0x67, 
0x1D, 0xC8, 0xD0, 
+0x67, 0xCD, 0x20, 0x50, 0x68, 0xFD, 0xAA, 0xD0, 0x69, 0xAD, 0x02, 0x50, 0x6A, 
0xDD, 0x8C, 0xD0, 
+0x6B, 0x96, 0x1E, 0xD0, 0x6C, 0xC6, 0xA9, 0x50, 0x6D, 0x76, 0x00, 0xD0, 0x6E, 
0xA6, 0x8B, 0x50, 
+0x6F, 0x55, 0xE2, 0xD0, 0x70, 0x86, 0x6D, 0x50, 0x71, 0x35, 0xC4, 0xD0, 0x72, 
0x66, 0x4F, 0x50, 
+0x73, 0x15, 0xA6, 0xD0, 0x74, 0x46, 0x31, 0x50, 0x74, 0xFE, 0xC3, 0x50, 0x76, 
0x2F, 0x4D, 0xD0, 
+0x76, 0xDE, 0xA5, 0x50, 0x78, 0x0F, 0x2F, 0xD0, 0x78, 0xBE, 0x87, 0x50, 0x79, 
0xEF, 0x11, 0xD0, 
+0x7A, 0x9E, 0x69, 0x50, 0x7B, 0xCE, 0xF3, 0xD0, 0x7C, 0x7E, 0x4B, 0x50, 0x7D, 
0xAE, 0xD5, 0xD0, 
+0x7E, 0x5E, 0x2D, 0x50, 0x7F, 0x8E, 0xB7, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -7028,22 +7028,22 @@
 0x3A, 0xC6, 0x53, 0x60, 0x3B, 0xB7, 0x87, 0xD0, 0x3C, 0xA7, 0x86, 0xE0, 0x3D, 
0x98, 0xBB, 0x50, 
 0x3E, 0x88, 0xBA, 0x60, 0x3F, 0x79, 0xEE, 0xD0, 0x40, 0x6B, 0x3F, 0x60, 0x41, 
0x5C, 0x73, 0xD0, 
 0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3D, 0xA7, 0x50, 0x44, 0x2D, 0xA6, 0x60, 0x45, 
0x12, 0xFD, 0x50, 
-0x46, 0x0C, 0x36, 0xE0, 0x47, 0x00, 0x0E, 0x50, 0x47, 0xEC, 0x18, 0xE0, 0x48, 
0xE2, 0x93, 0x50, 
-0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xC3, 0xC6, 0xD0, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 
0xA4, 0xFA, 0x50, 
-0x4D, 0x8B, 0xBE, 0xE0, 0x4E, 0x86, 0x2D, 0xD0, 0x4F, 0x74, 0xDB, 0x60, 0x50, 
0x68, 0xB2, 0xD0, 
-0x51, 0x54,

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 11:52:18 2007 UTC

  Modified files:  
/php-src/ext/standard   assert.c 
  Log:
  ws + cs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.74 php-src/ext/standard/assert.c:1.75
--- php-src/ext/standard/assert.c:1.74  Tue Jun 26 21:37:14 2007
+++ php-src/ext/standard/assert.c   Mon Nov  5 11:52:18 2007
@@ -14,16 +14,14 @@
+--+
| Author: Thies C. Arntzen [EMAIL PROTECTED]  |
+--+
- */
+*/
 
-/* $Id: assert.c,v 1.74 2007/06/26 21:37:14 tony2001 Exp $ */
+/* $Id: assert.c,v 1.75 2007/11/05 11:52:18 jani Exp $ */
 
 /* {{{ includes */
-
 #include php.h
 #include php_assert.h
 #include php_ini.h
-
 /* }}} */
 
 ZEND_BEGIN_MODULE_GLOBALS(assert)
@@ -80,10 +78,10 @@
 /* }}} */
 
 PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(assert.active, 1,PHP_INI_ALL,
OnUpdateLong,   active, zend_assert_globals,
assert_globals)
-STD_PHP_INI_ENTRY(assert.bail,   0,PHP_INI_ALL,
OnUpdateLong,   bail,   zend_assert_globals,
assert_globals)
+STD_PHP_INI_ENTRY(assert.active, 1,PHP_INI_ALL,
OnUpdateLong,   active, zend_assert_globals,
assert_globals)
+STD_PHP_INI_ENTRY(assert.bail,   0,PHP_INI_ALL,
OnUpdateLong,   bail,   zend_assert_globals,
assert_globals)
 STD_PHP_INI_ENTRY(assert.warning,1,PHP_INI_ALL,
OnUpdateLong,   warning,zend_assert_globals,
assert_globals)
-PHP_INI_ENTRY(assert.callback,   NULL,   PHP_INI_ALL,
OnChangeCallback)
+PHP_INI_ENTRY(assert.callback,   NULL,   PHP_INI_ALL,
OnChangeCallback)
 STD_PHP_INI_ENTRY(assert.quiet_eval, 0,PHP_INI_ALL,
OnUpdateLong,   quiet_eval, zend_assert_globals,
assert_globals)
 PHP_INI_END()
 
@@ -122,7 +120,7 @@
 
 PHP_RSHUTDOWN_FUNCTION(assert) /* {{{ */
 {
-   if (ASSERTG(callback)) { 
+   if (ASSERTG(callback)) {
zval_ptr_dtor(ASSERTG(callback));
ASSERTG(callback) = NULL;
}
@@ -139,15 +137,14 @@
 
 /* {{{ proto int assert(string|bool assertion) U
Checks if assertion is false */
-
 PHP_FUNCTION(assert)
 {
-   zval **assertion;   
+   zval **assertion;
zval tmp;
int val, free_tmp = 0;
char *myeval = NULL;
char *compiled_string_description;
-   
+
if (! ASSERTG(active)) {
RETURN_TRUE;
}
@@ -230,7 +227,7 @@
} else {
ZVAL_STRING(args[2], SAFE_STRING(myeval), 1);
}
-   
+
MAKE_STD_ZVAL(retval);
ZVAL_FALSE(retval);
 
@@ -259,18 +256,16 @@
zend_bailout();
}
 }
-
 /* }}} */
 
 /* {{{ proto mixed assert_options(int what [, mixed value]) U
Set/get the various assert flags */
-
 PHP_FUNCTION(assert_options)
 {
zval **what, **value;
int oldint;
int ac = ZEND_NUM_ARGS();
-   
+
if (ac  1 || ac  2 || zend_get_parameters_ex(ac, what, value) == 
FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -339,7 +334,6 @@
 
RETURN_FALSE;
 }
-
 /* }}} */
 
 /*

-- 
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/standard assert.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 11:52:31 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   assert.c 
  Log:
  MFH: ws + cs + folding tags
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.60.2.3.2.6r2=1.60.2.3.2.6.2.1diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.60.2.3.2.6 
php-src/ext/standard/assert.c:1.60.2.3.2.6.2.1
--- php-src/ext/standard/assert.c:1.60.2.3.2.6  Fri Feb 16 16:35:04 2007
+++ php-src/ext/standard/assert.c   Mon Nov  5 11:52:31 2007
@@ -14,15 +14,15 @@
+--+
| Author: Thies C. Arntzen [EMAIL PROTECTED]  |
+--+
- */
-
-/* $Id: assert.c,v 1.60.2.3.2.6 2007/02/16 16:35:04 dmitry Exp $ */
+*/
 
-/* {{{ includes/startup/misc */
+/* $Id: assert.c,v 1.60.2.3.2.6.2.1 2007/11/05 11:52:31 jani Exp $ */
 
+/* {{{ includes */
 #include php.h
 #include php_assert.h
 #include php_ini.h
+/* }}} */
 
 ZEND_BEGIN_MODULE_GLOBALS(assert)
long active;
@@ -51,7 +51,7 @@
ASSERT_QUIET_EVAL
 };
 
-static PHP_INI_MH(OnChangeCallback)
+static PHP_INI_MH(OnChangeCallback) /* {{{ */
 {
if (EG(in_execution)) {
if (ASSERTG(callback)) {
@@ -75,22 +75,24 @@
}
return SUCCESS;
 }
+/* }}} */
 
 PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY(assert.active, 1,PHP_INI_ALL,
OnUpdateLong,   active, zend_assert_globals,
assert_globals)
-STD_PHP_INI_ENTRY(assert.bail,   0,PHP_INI_ALL,
OnUpdateLong,   bail,   zend_assert_globals,
assert_globals)
+STD_PHP_INI_ENTRY(assert.active, 1,PHP_INI_ALL,
OnUpdateLong,   active, zend_assert_globals,
assert_globals)
+STD_PHP_INI_ENTRY(assert.bail,   0,PHP_INI_ALL,
OnUpdateLong,   bail,   zend_assert_globals,
assert_globals)
 STD_PHP_INI_ENTRY(assert.warning,1,PHP_INI_ALL,
OnUpdateLong,   warning,zend_assert_globals,
assert_globals)
-PHP_INI_ENTRY(assert.callback,   NULL,   PHP_INI_ALL,
OnChangeCallback)
+PHP_INI_ENTRY(assert.callback,   NULL,   PHP_INI_ALL,
OnChangeCallback)
 STD_PHP_INI_ENTRY(assert.quiet_eval, 0,PHP_INI_ALL,
OnUpdateLong,   quiet_eval, zend_assert_globals,
assert_globals)
 PHP_INI_END()
 
-static void php_assert_init_globals(zend_assert_globals *assert_globals_p 
TSRMLS_DC)
+static void php_assert_init_globals(zend_assert_globals *assert_globals_p 
TSRMLS_DC) /* {{{ */
 {
assert_globals_p-callback = NULL;
assert_globals_p-cb = NULL;
 }
+/* }}} */
 
-PHP_MINIT_FUNCTION(assert)
+PHP_MINIT_FUNCTION(assert) /* {{{ */
 {
ZEND_INIT_MODULE_GLOBALS(assert, php_assert_init_globals, NULL);
 
@@ -104,8 +106,9 @@
 
return SUCCESS;
 }
+/* }}} */
 
-PHP_MSHUTDOWN_FUNCTION(assert)
+PHP_MSHUTDOWN_FUNCTION(assert) /* {{{ */
 {
if (ASSERTG(cb)) {
pefree(ASSERTG(cb), 1);
@@ -113,35 +116,34 @@
}
return SUCCESS;
 }
+/* }}} */
 
-PHP_RSHUTDOWN_FUNCTION(assert)
+PHP_RSHUTDOWN_FUNCTION(assert) /* {{{ */
 {
-   if (ASSERTG(callback)) { 
+   if (ASSERTG(callback)) {
zval_ptr_dtor(ASSERTG(callback));
ASSERTG(callback) = NULL;
}
 
return SUCCESS;
 }
+/* }}} */
 
-PHP_MINFO_FUNCTION(assert)
+PHP_MINFO_FUNCTION(assert) /* {{{ */
 {
DISPLAY_INI_ENTRIES();
 }
-
-/* }}} */
-/* {{{ internal functions */
 /* }}} */
+
 /* {{{ proto int assert(string|bool assertion)
Checks if assertion is false */
-
 PHP_FUNCTION(assert)
 {
-   zval **assertion;   
+   zval **assertion;
int val;
char *myeval = NULL;
char *compiled_string_description;
-   
+
if (! ASSERTG(active)) {
RETURN_TRUE;
}
@@ -206,7 +208,7 @@
ZVAL_STRING(args[0], SAFE_STRING(filename), 1);
ZVAL_LONG (args[1], lineno);
ZVAL_STRING(args[2], SAFE_STRING(myeval), 1);
-   
+
MAKE_STD_ZVAL(retval);
ZVAL_FALSE(retval);
 
@@ -231,17 +233,16 @@
zend_bailout();
}
 }
-
 /* }}} */
+
 /* {{{ proto mixed assert_options(int what [, mixed value])
Set/get the various assert flags */
-
 PHP_FUNCTION(assert_options)
 {
zval **what, **value;
int oldint;
int ac = ZEND_NUM_ARGS();
-   
+
if (ac  1 || ac  2 || zend_get_parameters_ex(ac, what, value) == 
FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -310,7 +311,6 @@
 
RETURN_FALSE;
 }
-
 /*

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:07:28 2007 UTC

  Modified files:  
/php-src/ext/standard   base64.c 
  Log:
  - ws + cs + nuke a warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.53r2=1.54diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.53 php-src/ext/standard/base64.c:1.54
--- php-src/ext/standard/base64.c:1.53  Sat Jul 21 01:23:37 2007
+++ php-src/ext/standard/base64.c   Mon Nov  5 12:07:28 2007
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: base64.c,v 1.53 2007/07/21 01:23:37 jani Exp $ */
+/* $Id: base64.c,v 1.54 2007/11/05 12:07:28 jani Exp $ */
 
 #include string.h
 
@@ -23,13 +23,13 @@
 #include base64.h
 
 /* {{{ base64 tables */
-static const char base64_table[] =
-   { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
-   };
+static const char base64_table[] = {
+   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+   'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+   'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+   'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
+};
 
 static const char base64_pad = '=';
 
@@ -146,9 +146,9 @@
int ch, i = 0, j = 0, k;
/* this sucks for threaded environments */
unsigned char *result;
-   
+
result = (unsigned char *)safe_emalloc(length, 1, 1);
-   
+
/* run through the whole string, converting as we go */
while ((ch = *current++) != '\0'  length--  0) {
if (ch == base64_pad) break;
@@ -233,7 +233,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, str, 
str_len, strict) == FAILURE) {
return;
}
-   result = php_base64_decode_ex(str, str_len, ret_length, strict);
+   result = php_base64_decode_ex((unsigned char*)str, str_len, 
ret_length, strict);
if (result != NULL) {
RETVAL_STRINGL((char*)result, ret_length, 0);
} else {

-- 
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/standard base64.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:07:37 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   base64.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.43.2.2.2.3r2=1.43.2.2.2.3.2.1diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.43.2.2.2.3 
php-src/ext/standard/base64.c:1.43.2.2.2.3.2.1
--- php-src/ext/standard/base64.c:1.43.2.2.2.3  Sat Jul 21 01:24:26 2007
+++ php-src/ext/standard/base64.c   Mon Nov  5 12:07:37 2007
@@ -15,21 +15,21 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: base64.c,v 1.43.2.2.2.3 2007/07/21 01:24:26 jani Exp $ */
+/* $Id: base64.c,v 1.43.2.2.2.3.2.1 2007/11/05 12:07:37 jani Exp $ */
 
 #include string.h
 
 #include php.h
 #include base64.h
 
-/* {{{ */
-static const char base64_table[] =
-   { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
- 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
-   };
+/* {{{ base64 tables */
+static const char base64_table[] = {
+   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+   'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+   'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+   'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/', '\0'
+};
 
 static const char base64_pad = '=';
 
@@ -53,8 +53,7 @@
 };
 /* }}} */
 
-/* {{{ php_base64_encode */
-PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length, 
int *ret_length)
+PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length, 
int *ret_length) /* {{{ */
 {
const unsigned char *current = str;
unsigned char *p;
@@ -135,21 +134,20 @@
 */
 /* }}} */
 
-PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, 
int *ret_length)
+PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, 
int *ret_length) /* {{{ */
 {
return php_base64_decode_ex(str, length, ret_length, 0);
 }
+/* }}} */
 
-/* {{{ php_base64_decode */
-/* as above, but backwards. :) */
-PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int 
length, int *ret_length, zend_bool strict)
+PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int 
length, int *ret_length, zend_bool strict) /* {{{ */
 {
const unsigned char *current = str;
int ch, i = 0, j = 0, k;
/* this sucks for threaded environments */
unsigned char *result;
-   
-   result = (unsigned char *)emalloc(length + 1);
+
+   result = (unsigned char *)safe_emalloc(length, 1, 1);
 
/* run through the whole string, converting as we go */
while ((ch = *current++) != '\0'  length--  0) {
@@ -214,16 +212,15 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, str, 
str_len) == FAILURE) {
return;
}
-   result = php_base64_encode(str, str_len, ret_length);
+   result = php_base64_encode((unsigned char*)str, str_len, ret_length);
if (result != NULL) {
-   RETVAL_STRINGL(result, ret_length, 0);
+   RETVAL_STRINGL((char*)result, ret_length, 0);
} else {
RETURN_FALSE;
}
 }
 /* }}} */
 
-
 /* {{{ proto string base64_decode(string str[, bool strict])
Decodes string using MIME base64 algorithm */
 PHP_FUNCTION(base64_decode)
@@ -236,16 +233,15 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|b, str, 
str_len, strict) == FAILURE) {
return;
}
-   result = php_base64_decode_ex(str, str_len, ret_length, strict);
+   result = php_base64_decode_ex((unsigned char*)str, str_len, 
ret_length, strict);
if (result != NULL) {
-   RETVAL_STRINGL(result, ret_length, 0);
+   RETVAL_STRINGL((char*)result, ret_length, 0);
} else {
RETURN_FALSE;
}
 }
 /* }}} */
 
-
 /*
  * Local variables:
  * tab-width: 4

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:24:33 2007 UTC

  Modified files:  
/php-src/ext/standard   browscap.c 
  Log:
  ws + cs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.96r2=1.97diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.96 
php-src/ext/standard/browscap.c:1.97
--- php-src/ext/standard/browscap.c:1.96Fri Sep 28 23:34:31 2007
+++ php-src/ext/standard/browscap.c Mon Nov  5 12:24:33 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: browscap.c,v 1.96 2007/09/28 23:34:31 jani Exp $ */
+/* $Id: browscap.c,v 1.97 2007/11/05 12:24:33 jani Exp $ */
 
 #include php.h
 #include php_browscap.h
@@ -132,7 +132,7 @@
}
new_key = zend_strndup(Z_STRVAL_P(arg1), 
Z_STRLEN_P(arg1));
zend_str_tolower(new_key, Z_STRLEN_P(arg1));
-   zend_hash_update(Z_ARRVAL_P(current_section), 
new_key, Z_STRLEN_P(arg1)+1, new_property, sizeof(zval *), NULL);
+   zend_hash_update(Z_ARRVAL_P(current_section), 
new_key, Z_STRLEN_P(arg1) + 1, new_property, sizeof(zval *), NULL);
free(new_key);
}
break;
@@ -141,7 +141,7 @@
zval *unprocessed;
HashTable *section_properties;
 
-   /*printf('%s' 
(%d)\n,$1.value.str.val,$1.value.str.len+1);*/
+   /*printf('%s' 
(%d)\n,$1.value.str.val,$1.value.str.len + 1);*/
current_section = (zval *) 
pemalloc(sizeof(zval), 1);
INIT_PZVAL(current_section);
processed = (zval *) pemalloc(sizeof(zval), 1);
@@ -154,8 +154,8 @@
Z_ARRVAL_P(current_section) = 
section_properties;
Z_TYPE_P(current_section) = IS_ARRAY;
current_section_name = 
zend_strndup(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1));
-   
-   zend_hash_update(browser_hash, 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, (void *) current_section, sizeof(zval 
*), NULL);
+
+   zend_hash_update(browser_hash, 
Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, (void *) current_section, sizeof(zval 
*), NULL);
 
Z_STRVAL_P(processed) = Z_STRVAL_P(arg1);
Z_STRLEN_P(processed) = Z_STRLEN_P(arg1);
@@ -182,7 +182,7 @@
zend_file_handle fh;
memset(fh, 0, sizeof(fh));
 
-   if (zend_hash_init_ex(browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1, 0)==FAILURE) {
+   if (zend_hash_init_ex(browser_hash, 0, NULL, (dtor_func_t) 
browscap_entry_dtor, 1, 0) == FAILURE) {
return FAILURE;
}
 
@@ -229,15 +229,14 @@
}
}
 
-
if (zend_hash_find(Z_ARRVAL_PP(browser), browser_name_regex, 
sizeof(browser_name_regex), (void **) browser_regex) == FAILURE) {
return 0;
}
 
-   if (regcomp(r, Z_STRVAL_PP(browser_regex), REG_NOSUB)!=0) {
+   if (regcomp(r, Z_STRVAL_PP(browser_regex), REG_NOSUB) != 0) {
return 0;
}
-   if (regexec(r, lookup_browser_name, 0, NULL, 0)==0) {
+   if (regexec(r, lookup_browser_name, 0, NULL, 0) == 0) {
/* If we've found a possible browser, we need to do a 
comparison of the
   number of characters changed in the user agent being checked 
versus
   the previous match found and the current match. */
@@ -276,7 +275,6 @@
}
}
 
-
/* Pick which browser pattern replaces the least amount 
of
   characters when compared to the original user agent 
string... */
if (ua_len - prev_len  ua_len - curr_len) {
@@ -297,9 +295,7 @@
 /* }}} */
 
 /* {{{ proto mixed get_browser([string browser_name [, bool return_array]]) U
-   Get information about the capabilities of a browser. If browser_name is 
omitted
-   or null, HTTP_USER_AGENT is used. Returns an object by default; if 
return_array
-   is true, returns an array. */
+   Get information about the capabilities of a browser. If browser_name is 
omitted or null, HTTP_USER_AGENT is used. Returns an object by default; if 
return_array is true, returns an array. */
 PHP_FUNCTION(get_browser)
 {
char *agent_name = NULL;
@@ -315,15 +311,14 @@
RETURN_FALSE;
}
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s!b, 
agent_name,
- agent_name_len,

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:27:42 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   credits.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.36.2.4.2.4r2=1.36.2.4.2.4.2.1diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.36.2.4.2.4 
php-src/ext/standard/credits.c:1.36.2.4.2.4.2.1
--- php-src/ext/standard/credits.c:1.36.2.4.2.4 Tue May 22 15:44:11 2007
+++ php-src/ext/standard/credits.c  Mon Nov  5 12:27:42 2007
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: credits.c,v 1.36.2.4.2.4 2007/05/22 15:44:11 bjori Exp $ */
+/* $Id: credits.c,v 1.36.2.4.2.4.2.1 2007/11/05 12:27:42 jani Exp $ */
 
 #include php.h
 #include info.h
@@ -25,9 +25,7 @@
 
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, 
authors)
 
-/* {{{ php_print_credits
- */
-PHPAPI void php_print_credits(int flag TSRMLS_DC)
+PHPAPI void php_print_credits(int flag TSRMLS_DC) /* {{{ */
 {
if (!sapi_module.phpinfo_as_text  flag  PHP_CREDITS_FULLPAGE) {
php_print_info_htmlhead(TSRMLS_C);
@@ -61,7 +59,7 @@
 
/* PHP Language */
php_info_print_table_start();
-   php_info_print_table_colspan_header(2, PHP 5 Authors);
+   php_info_print_table_colspan_header(2, PHP Authors);
php_info_print_table_header(2, Contribution, Authors);
CREDIT_LINE(Zend Scripting Language Engine, Andi Gutmans, 
Zeev Suraski);
CREDIT_LINE(Extension Module API, Andi Gutmans, Zeev 
Suraski, Andrei Zmievski);

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

[PHP-CVS] cvs: php-src /ext/standard credits_ext.h

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:29:30 2007 UTC

  Modified files:  
/php-src/ext/standard   credits_ext.h 
  Log:
  Update credits
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.42 
php-src/ext/standard/credits_ext.h:1.43
--- php-src/ext/standard/credits_ext.h:1.42 Thu Apr 19 09:47:48 2007
+++ php-src/ext/standard/credits_ext.h  Mon Nov  5 12:29:30 2007
@@ -22,6 +22,7 @@
 CREDIT_LINE(dBase, Jim Winstead);
 CREDIT_LINE(DB-LIB (MS SQL, Sybase), Wez Furlong, Frank M. Kromann);
 CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger);
+CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko HyvÃ¤tti);
 CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger);
 CREDIT_LINE(FBSQL, Frank M. Kromann);
 CREDIT_LINE(FDF, Uwe Steinmann);
@@ -32,7 +33,6 @@
 CREDIT_LINE(GNU GMP support, Stanislav Malyshev);
 CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi );
 CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, 
Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R 
Kalowsky);
-CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius);
 CREDIT_LINE(Input Filter, Rasmus Lerdorf, Derick Rethans, Pierre-Alain 
Joye, Ilia Alshanetsky);
 CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel);
 CREDIT_LINE(JSON, Omar Kilani);
@@ -47,6 +47,7 @@
 CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa);
 CREDIT_LINE(mySQL driver for PDO, George Schlossnagle, Wez Furlong, Ilia 
Alshanetsky);
 CREDIT_LINE(MySQLi, Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel);
+CREDIT_LINE(MySQLnd, Georg Richter, Andrey Hristov, Ulf Wendel);
 CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter);
 CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David 
Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong);
 CREDIT_LINE(ODBC driver for PDO, Wez Furlong);
@@ -64,7 +65,7 @@
 CREDIT_LINE(Readline, Thies C. Arntzen);
 CREDIT_LINE(Recode, Kristian KÃ¶hntopp);
 CREDIT_LINE(Reflection, Marcus Boerger, Timm Friebe, George Schlossnagle, 
Andrei Zmievski, Johannes Schlueter);
-CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
+CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski, Sara Golemon);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);
 CREDIT_LINE(SimpleXML, Sterling Hughes, Marcus Boerger, Rob Richards);
 CREDIT_LINE(SNMP, Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven 
Lawrance, Johann Hanne);
@@ -79,7 +80,7 @@
 CREDIT_LINE(System V Semaphores, Tom May);
 CREDIT_LINE(System V Shared Memory, Christian Cartus);
 CREDIT_LINE(tidy, John Coggeshall, Ilia Alshanetsky);
-CREDIT_LINE(tokenizer, Andrei Zmievski);
+CREDIT_LINE(tokenizer, Andrei Zmievski, Johannes Schlueter);
 CREDIT_LINE(unicode, Andrei Zmievski);
 CREDIT_LINE(WDDX, Andrei Zmievski);
 CREDIT_LINE(XMLReader, Rob Richards);

-- 
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/standard credits_ext.h

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:30:04 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   credits_ext.h 
  Log:
  update credits
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6r2=1.30.2.6.2.6.2.1diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6 
php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.1
--- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6 Sun Apr 29 00:43:11 2007
+++ php-src/ext/standard/credits_ext.h  Mon Nov  5 12:30:04 2007
@@ -22,6 +22,7 @@
 CREDIT_LINE(dBase, Jim Winstead);
 CREDIT_LINE(DB-LIB (MS SQL, Sybase), Wez Furlong, Frank M. Kromann);
 CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger);
+CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko HyvÃ¤tti);
 CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger);
 CREDIT_LINE(FBSQL, Frank M. Kromann);
 CREDIT_LINE(FDF, Uwe Steinmann);
@@ -79,7 +80,7 @@
 CREDIT_LINE(System V Semaphores, Tom May);
 CREDIT_LINE(System V Shared Memory, Christian Cartus);
 CREDIT_LINE(tidy, John Coggeshall, Ilia Alshanetsky);
-CREDIT_LINE(tokenizer, Andrei Zmievski);
+CREDIT_LINE(tokenizer, Andrei Zmievski, Johannes Schlueter);
 CREDIT_LINE(WDDX, Andrei Zmievski);
 CREDIT_LINE(XMLReader, Rob Richards);
 CREDIT_LINE(xmlrpc, Dan Libby);

-- 
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/recode CREDITS /ext/standard credits_ext.h

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:33:40 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/recode CREDITS 
/php-src/ext/standard   credits_ext.h 
  Log:
  - fix oumlaut :)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/recode/CREDITS?r1=1.1r2=1.1.36.1diff_format=u
Index: php-src/ext/recode/CREDITS
diff -u php-src/ext/recode/CREDITS:1.1 php-src/ext/recode/CREDITS:1.1.36.1
--- php-src/ext/recode/CREDITS:1.1  Mon Nov 20 10:31:35 2000
+++ php-src/ext/recode/CREDITS  Mon Nov  5 12:33:40 2007
@@ -1,2 +1,2 @@
 Recode
-Kristian Köhntopp
+Kristian KÃ¶hntopp
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.1r2=1.30.2.6.2.6.2.2diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.1 
php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.2
--- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.1 Mon Nov  5 12:30:04 2007
+++ php-src/ext/standard/credits_ext.h  Mon Nov  5 12:33:40 2007
@@ -63,7 +63,7 @@
 CREDIT_LINE(PostgreSQL, Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris 
Kings-Lynne);
 CREDIT_LINE(Pspell, Vlad Krupin);
 CREDIT_LINE(Readline, Thies C. Arntzen);
-CREDIT_LINE(Recode, Kristian Köhntopp);
+CREDIT_LINE(Recode, Kristian KÃ¶hntopp);
 CREDIT_LINE(Reflection, Marcus Boerger, Timm Friebe, George Schlossnagle, 
Andrei Zmievski, Johannes Schlueter);
 CREDIT_LINE(Sessions, Sascha Schumann, Andrei Zmievski);
 CREDIT_LINE(Shared Memory Operations, Slava Poliakov, Ilia Alshanetsky);

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:39:39 2007 UTC

  Modified files:  
/php-src/ext/standard   crypt.c 
  Log:
  ws + cs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.71r2=1.72diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.71 php-src/ext/standard/crypt.c:1.72
--- php-src/ext/standard/crypt.c:1.71   Tue Jun 26 21:37:14 2007
+++ php-src/ext/standard/crypt.cMon Nov  5 12:39:39 2007
@@ -16,8 +16,10 @@
|  Zeev Suraski [EMAIL PROTECTED]|
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
- */
-/* $Id: crypt.c,v 1.71 2007/06/26 21:37:14 tony2001 Exp $ */
+*/
+
+/* $Id: crypt.c,v 1.72 2007/11/05 12:39:39 jani Exp $ */
+
 #include stdlib.h
 
 #include php.h
@@ -53,12 +55,11 @@
 #include php_crypt.h
 #include php_rand.h
 
-/* 
-   The capabilities of the crypt() function is determined by the test programs
-   run by configure from aclocal.m4.  They will set PHP_STD_DES_CRYPT,
-   PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate 
-   for the target platform
-*/
+/* The capabilities of the crypt() function is determined by the test programs
+ * run by configure from aclocal.m4.  They will set PHP_STD_DES_CRYPT,
+ * PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate
+ * for the target platform. */
+
 #if PHP_STD_DES_CRYPT
 #define PHP_MAX_SALT_LEN 2
 #endif
@@ -78,10 +79,8 @@
 #define PHP_MAX_SALT_LEN 60
 #endif
 
- /*
-  * If the configure-time checks fail, we provide DES.
-  * XXX: This is a hack. Fix the real problem
-  */
+/* If the configure-time checks fail, we provide DES.
+ * XXX: This is a hack. Fix the real problem! */
 
 #ifndef PHP_MAX_SALT_LEN
 #define PHP_MAX_SALT_LEN 2
@@ -89,7 +88,6 @@
 #define PHP_STD_DES_CRYPT 1
 #endif
 
-
 #define PHP_CRYPT_RAND php_rand(TSRMLS_C)
 
 PHP_MINIT_FUNCTION(crypt) /* {{{ */
@@ -109,27 +107,27 @@
 static void php_to64(char *s, long v, int n) /* {{{ */
 {
while (--n = 0) {
-   *s++ = itoa64[v0x3f];  
+   *s++ = itoa64[v0x3f];
v = 6;
-   } 
-} 
+   }
+}
 /* }}} */
 
 /* {{{ proto string crypt(string str [, string salt]) U
Hash a string */
 PHP_FUNCTION(crypt)
 {
-   char salt[PHP_MAX_SALT_LEN+1];
+   char salt[PHP_MAX_SALT_LEN + 1];
char *str, *salt_in = NULL;
int str_len, salt_in_len;
 
-   salt[0]=salt[PHP_MAX_SALT_LEN]='\0';
+   salt[0] = salt[PHP_MAX_SALT_LEN] = '\0';
+
/* This will produce suitable results if people depend on DES-encryption
-  available (passing always 2-character salt). At least for glibc6.1 */
-   memset(salt[1], '$', PHP_MAX_SALT_LEN-1);
+* available (passing always 2-character salt). At least for glibc6.1 */
+   memset(salt[1], '$', PHP_MAX_SALT_LEN - 1);
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, S|S, str, 
str_len,
- salt_in, 
salt_in_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, S|S, str, 
str_len, salt_in, salt_in_len) == FAILURE) {
return;
}
 
@@ -138,7 +136,7 @@
}
 
/* The automatic salt generation only covers standard DES and md5-crypt 
*/
-   if(!*salt) {
+   if (!*salt) {
 #if PHP_MD5_CRYPT
strcpy(salt, $1$);
php_to64(salt[3], PHP_CRYPT_RAND, 4);
@@ -156,7 +154,7 @@
memset(buffer, 0, sizeof(buffer));
 #elif defined(CRYPT_R_CRYPTD)
CRYPTD buffer;
-#else 
+#else
 #error Data struct used by crypt_r() is unknown. Please report.
 #endif
 

-- 
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/standard crypt.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:39:44 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   crypt.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.62.2.1.2.6r2=1.62.2.1.2.6.2.1diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.62.2.1.2.6 
php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.1
--- php-src/ext/standard/crypt.c:1.62.2.1.2.6   Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/crypt.cMon Nov  5 12:39:44 2007
@@ -16,8 +16,10 @@
|  Zeev Suraski [EMAIL PROTECTED]|
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
- */
-/* $Id: crypt.c,v 1.62.2.1.2.6 2007/01/01 09:36:08 sebastian Exp $ */
+*/
+
+/* $Id: crypt.c,v 1.62.2.1.2.6.2.1 2007/11/05 12:39:44 jani Exp $ */
+
 #include stdlib.h
 
 #include php.h
@@ -53,12 +55,11 @@
 #include php_crypt.h
 #include php_rand.h
 
-/* 
-   The capabilities of the crypt() function is determined by the test programs
-   run by configure from aclocal.m4.  They will set PHP_STD_DES_CRYPT,
-   PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate 
-   for the target platform
-*/
+/* The capabilities of the crypt() function is determined by the test programs
+ * run by configure from aclocal.m4.  They will set PHP_STD_DES_CRYPT,
+ * PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate
+ * for the target platform. */
+
 #if PHP_STD_DES_CRYPT
 #define PHP_MAX_SALT_LEN 2
 #endif
@@ -78,10 +79,8 @@
 #define PHP_MAX_SALT_LEN 60
 #endif
 
- /*
-  * If the configure-time checks fail, we provide DES.
-  * XXX: This is a hack. Fix the real problem
-  */
+/* If the configure-time checks fail, we provide DES.
+ * XXX: This is a hack. Fix the real problem! */
 
 #ifndef PHP_MAX_SALT_LEN
 #define PHP_MAX_SALT_LEN 2
@@ -89,10 +88,9 @@
 #define PHP_STD_DES_CRYPT 1
 #endif
 
-
 #define PHP_CRYPT_RAND php_rand(TSRMLS_C)
 
-PHP_MINIT_FUNCTION(crypt)
+PHP_MINIT_FUNCTION(crypt) /* {{{ */
 {
REGISTER_LONG_CONSTANT(CRYPT_SALT_LENGTH, PHP_MAX_SALT_LEN, CONST_CS 
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CRYPT_STD_DES, PHP_STD_DES_CRYPT, CONST_CS | 
CONST_PERSISTENT);
@@ -102,33 +100,34 @@
 
return SUCCESS;
 }
-
+/* }}} */
 
 static unsigned char itoa64[] = 
./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz;
 
-static void php_to64(char *s, long v, int n)
+static void php_to64(char *s, long v, int n) /* {{{ */
 {
while (--n = 0) {
-   *s++ = itoa64[v0x3f];  
+   *s++ = itoa64[v0x3f];
v = 6;
-   } 
-} 
+   }
+}
+/* }}} */
 
 /* {{{ proto string crypt(string str [, string salt])
-   Encrypt a string */
+   Hash a string */
 PHP_FUNCTION(crypt)
 {
-   char salt[PHP_MAX_SALT_LEN+1];
+   char salt[PHP_MAX_SALT_LEN + 1];
char *str, *salt_in = NULL;
int str_len, salt_in_len;
 
-   salt[0]=salt[PHP_MAX_SALT_LEN]='\0';
+   salt[0] = salt[PHP_MAX_SALT_LEN] = '\0';
+
/* This will produce suitable results if people depend on DES-encryption
-  available (passing always 2-character salt). At least for glibc6.1 */
-   memset(salt[1], '$', PHP_MAX_SALT_LEN-1);
+* available (passing always 2-character salt). At least for glibc6.1 */
+   memset(salt[1], '$', PHP_MAX_SALT_LEN - 1);
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, str, 
str_len,
- salt_in, 
salt_in_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, str, 
str_len, salt_in, salt_in_len) == FAILURE) {
return;
}
 
@@ -137,7 +136,7 @@
}
 
/* The automatic salt generation only covers standard DES and md5-crypt 
*/
-   if(!*salt) {
+   if (!*salt) {
 #if PHP_MD5_CRYPT
strcpy(salt, $1$);
php_to64(salt[3], PHP_CRYPT_RAND, 4);
@@ -155,7 +154,7 @@
memset(buffer, 0, sizeof(buffer));
 #elif defined(CRYPT_R_CRYPTD)
CRYPTD buffer;
-#else 
+#else
 #error Data struct used by crypt_r() is unknown. Please report.
 #endif
 

-- 
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/standard css.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:40:40 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   css.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/css.c?r1=1.13.2.1.2.1r2=1.13.2.1.2.1.2.1diff_format=u
Index: php-src/ext/standard/css.c
diff -u php-src/ext/standard/css.c:1.13.2.1.2.1 
php-src/ext/standard/css.c:1.13.2.1.2.1.2.1
--- php-src/ext/standard/css.c:1.13.2.1.2.1 Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/css.c  Mon Nov  5 12:40:40 2007
@@ -16,15 +16,12 @@
+--+
 */
 
-/* $Id: css.c,v 1.13.2.1.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: css.c,v 1.13.2.1.2.1.2.1 2007/11/05 12:40:40 jani Exp $ */
 
 #include php.h
 #include info.h
 
-
-/* {{{ php_info_print_css
- */
-PHPAPI void php_info_print_css(TSRMLS_D)
+PHPAPI void php_info_print_css(TSRMLS_D) /* {{{ */
 {
PUTS(body {background-color: #ff; color: #00;}\n);
PUTS(body, td, th, h1, h2 {font-family: sans-serif;}\n);

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:44:47 2007 UTC

  Modified files:  
/php-src/ext/standard   cyr_convert.c 
  Log:
  ws + cs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/cyr_convert.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/standard/cyr_convert.c
diff -u php-src/ext/standard/cyr_convert.c:1.33 
php-src/ext/standard/cyr_convert.c:1.34
--- php-src/ext/standard/cyr_convert.c:1.33 Tue Jun 26 21:37:14 2007
+++ php-src/ext/standard/cyr_convert.c  Mon Nov  5 12:44:47 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: cyr_convert.c,v 1.33 2007/06/26 21:37:14 tony2001 Exp $ */
+/* $Id: cyr_convert.c,v 1.34 2007/11/05 12:44:47 jani Exp $ */
 
 #include stdlib.h
 
@@ -275,13 +275,12 @@
int input_len, fr_cs_len, to_cs_len;
unsigned char *str;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Sss, input,
- input_len, fr_cs, 
fr_cs_len, to_cs, to_cs_len) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Sss, input, 
input_len, fr_cs, fr_cs_len, to_cs, to_cs_len) == FAILURE) {
return;
}
 
str = (unsigned char*) estrndup(input, input_len);
-   
+
php_convert_cyr_string(str, input_len, fr_cs[0], to_cs[0] TSRMLS_CC);
RETVAL_STRING((char *)str, 0)
 }

-- 
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/standard cyr_convert.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 12:44:53 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   cyr_convert.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/cyr_convert.c?r1=1.27.2.3.2.1r2=1.27.2.3.2.1.2.1diff_format=u
Index: php-src/ext/standard/cyr_convert.c
diff -u php-src/ext/standard/cyr_convert.c:1.27.2.3.2.1 
php-src/ext/standard/cyr_convert.c:1.27.2.3.2.1.2.1
--- php-src/ext/standard/cyr_convert.c:1.27.2.3.2.1 Mon Jan  1 09:36:08 2007
+++ php-src/ext/standard/cyr_convert.c  Mon Nov  5 12:44:52 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: cyr_convert.c,v 1.27.2.3.2.1 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: cyr_convert.c,v 1.27.2.3.2.1.2.1 2007/11/05 12:44:52 jani Exp $ */
 
 #include stdlib.h
 
@@ -187,7 +187,7 @@
 };
 /* }}} */
 
-/* {{{ php_convert_cyr_string
+/* {{{ static char * php_convert_cyr_string(unsigned char *str, int length, 
char from, char to TSRMLS_DC)
 * This is the function that performs real in-place conversion of the string 
 * between charsets. 
 * Parameters:
@@ -271,20 +271,17 @@
Convert from one Cyrillic character set to another */
 PHP_FUNCTION(convert_cyr_string)
 {
-zval **str_arg, **fr_cs, **to_cs;
+   char *input, *fr_cs, *to_cs;
+   int input_len, fr_cs_len, to_cs_len;
unsigned char *str;
 
-if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3,str_arg,fr_cs, 
to_cs)==FAILURE)
-{
-WRONG_PARAM_COUNT;
-}
-convert_to_string_ex(str_arg);
-convert_to_string_ex(fr_cs);
-convert_to_string_ex(to_cs);
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sss, input, 
input_len, fr_cs, fr_cs_len, to_cs, to_cs_len) == FAILURE) {
+   return;
+   }
 
-   str = (unsigned char*) estrndup(Z_STRVAL_PP(str_arg), 
Z_STRLEN_PP(str_arg));
-   
-   php_convert_cyr_string(str, Z_STRLEN_PP(str_arg), 
Z_STRVAL_PP(fr_cs)[0], Z_STRVAL_PP(to_cs)[0] TSRMLS_CC);
+   str = (unsigned char*) estrndup(input, input_len);
+
+   php_convert_cyr_string(str, input_len, fr_cs[0], to_cs[0] TSRMLS_CC);
RETVAL_STRING((char *)str, 0)
 }
 /* }}} */

-- 
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/standard datetime.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 13:09:44 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   datetime.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.134.2.2.2.4r2=1.134.2.2.2.4.2.1diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.134.2.2.2.4 
php-src/ext/standard/datetime.c:1.134.2.2.2.4.2.1
--- php-src/ext/standard/datetime.c:1.134.2.2.2.4   Thu Jun  7 08:59:00 2007
+++ php-src/ext/standard/datetime.c Mon Nov  5 13:09:44 2007
@@ -1,4 +1,4 @@
-/* 
+/*
+--+
| PHP Version 5|
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: datetime.c,v 1.134.2.2.2.4 2007/06/07 08:59:00 tony2001 Exp $ */
+/* $Id: datetime.c,v 1.134.2.2.2.4.2.1 2007/11/05 13:09:44 jani Exp $ */
 
 #include php.h
 #include zend_operators.h
@@ -49,7 +49,7 @@
Sun, Mon, Tue, Wed, Thu, Fri, Sat
 };
 
-/* {{{ php_std_date
+/* {{{ PHPAPI char *php_std_date(time_t t TSRMLS_DC)
Return date string in standard format for http headers */
 PHPAPI char *php_std_date(time_t t TSRMLS_DC)
 {
@@ -79,13 +79,12 @@
((tm1-tm_year) % 100),
tm1-tm_hour, tm1-tm_min, tm1-tm_sec);
}
-   
+
str[79] = 0;
return (str);
 }
 /* }}} */
 
-
 #if HAVE_STRPTIME
 #ifndef HAVE_STRPTIME_DECL_FAILS
 char *strptime(const char *s, const char *format, struct tm *tm);
@@ -102,8 +101,7 @@
struct tm  parsed_time;
char  *unparsed_part;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, 
-   ts, ts_length, format, format_length) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, ts, 
ts_length, format, format_length) == FAILURE) {
return;
}
 
@@ -126,6 +124,7 @@
add_assoc_string(return_value, unparsed, unparsed_part, 1);
 }
 /* }}} */
+
 #endif
 
 /*

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 13:09:31 2007 UTC

  Modified files:  
/php-src/ext/standard   datetime.c 
  Log:
  - ws 
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.146r2=1.147diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.146 
php-src/ext/standard/datetime.c:1.147
--- php-src/ext/standard/datetime.c:1.146   Tue Jun 26 21:37:14 2007
+++ php-src/ext/standard/datetime.c Mon Nov  5 13:09:31 2007
@@ -1,4 +1,4 @@
-/* 
+/*
+--+
| PHP Version 5|
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: datetime.c,v 1.146 2007/06/26 21:37:14 tony2001 Exp $ */
+/* $Id: datetime.c,v 1.147 2007/11/05 13:09:31 jani Exp $ */
 
 #include php.h
 #include zend_operators.h
@@ -79,7 +79,7 @@
((tm1-tm_year) % 100),
tm1-tm_hour, tm1-tm_min, tm1-tm_sec);
}
-   
+
str[79] = 0;
return (str);
 }
@@ -102,8 +102,7 @@
char  *unparsed_part;
zend_uchar type;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, TT, 
-   ts, ts_length, type, format, format_length, type) == 
FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, TT,  ts, 
ts_length, type, format, format_length, type) == FAILURE) {
return;
}
 

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 13:40:36 2007 UTC

  Modified files:  
/php-src/ext/standard   dns.c 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.86r2=1.87diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.86 php-src/ext/standard/dns.c:1.87
--- php-src/ext/standard/dns.c:1.86 Tue Jun 26 11:03:42 2007
+++ php-src/ext/standard/dns.c  Mon Nov  5 13:40:36 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.86 2007/06/26 11:03:42 tony2001 Exp $ */
+/* $Id: dns.c,v 1.87 2007/11/05 13:40:36 jani Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -33,7 +33,7 @@
 #define WINNT 1
 #endif
 /* located in www.php.net/extra/bindlib.zip */
-#if HAVE_ARPA_INET_H 
+#if HAVE_ARPA_INET_H
 #include arpa/inet.h
 #endif
 #include netdb.h
@@ -125,12 +125,12 @@
 {
char *addr;
int addr_len;
-   char *hostname; 
+   char *hostname;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, addr, 
addr_len) == FAILURE) {
return;
}
-   
+
hostname = php_gethostbyaddr(addr);
 
if (hostname == NULL) {
@@ -258,13 +258,12 @@
char *hostname, *rectype = NULL;
int hostname_len, rectype_len = 0;
int type = T_MX, i;
-   
+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, hostname, 
hostname_len, rectype, rectype_len) == FAILURE) {
return;
}
 
-   if (hostname_len == 0)
-   {
+   if (hostname_len == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Host cannot be 
empty);
RETURN_FALSE;
}
@@ -272,7 +271,7 @@
if (rectype) {
 if (!strcasecmp(A, rectype)) type = T_A;
else if (!strcasecmp(NS,rectype)) type = DNS_T_NS;
-   else if (!strcasecmp(MX,rectype)) type = DNS_T_MX;

+   else if (!strcasecmp(MX,rectype)) type = DNS_T_MX;
else if (!strcasecmp(PTR,   rectype)) type = DNS_T_PTR;
else if (!strcasecmp(ANY,   rectype)) type = DNS_T_ANY;
else if (!strcasecmp(SOA,   rectype)) type = DNS_T_SOA;
@@ -312,7 +311,7 @@
 #define PHP_DNS_TXT0x8000
 #define PHP_DNS_A6 0x0100
 #define PHP_DNS_SRV0x0200
-#define PHP_DNS_NAPTR  0x0400
+#define PHP_DNS_NAPTR  0x0400
 #define PHP_DNS_   0x0800
 #define PHP_DNS_ANY0x1000
 #define PHP_DNS_ALL
(PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_)
@@ -355,10 +354,10 @@
u_char qb2[65536];
 } querybuf;
 
-/* just a hack to free resources allocated by glibc in __res_nsend() 
- * See also: 
- *   res_thread_freeres() in glibc/resolv/res_init.c 
- *   __libc_res_nsend()   in resolv/res_send.c 
+/* just a hack to free resources allocated by glibc in __res_nsend()
+ * See also:
+ *   res_thread_freeres() in glibc/resolv/res_init.c
+ *   __libc_res_nsend()   in resolv/res_send.c
  * */
 
 #ifdef __GLIBC__
@@ -394,7 +393,7 @@
return NULL;
}
cp += n;
-   
+
GETSHORT(type, cp);
GETSHORT(class, cp);
GETLONG(ttl, cp);
@@ -524,7 +523,7 @@
tp[0] = '\0';
add_ascii_assoc_rt_string(*subarray, type, , 
ZSTR_DUPLICATE);
add_ascii_assoc_rt_string(*subarray, ipv6, name, 
ZSTR_DUPLICATE);
-   break; 
+   break;
case DNS_T_A6:
p = cp;
add_ascii_assoc_rt_string(*subarray, type, A6, 
ZSTR_DUPLICATE);
@@ -562,7 +561,7 @@
}
cp++;
}
-   for(i = (n+8)/16; i  8; i++) {
+   for (i = (n + 8) / 16; i  8; i++) {
GETSHORT(s, cp);
if (s != 0) {
if (tp  (u_char *)name) {
@@ -692,32 +691,34 @@
 *   NUMTYPES+1 when results were already fetched.
 * - In case of PHP_DNS_ANY we use the directly fetch DNS_T_ANY. (step 
NUMTYPES+1 )
 */
-   for(type = (type_param==PHP_DNS_ANY ? (PHP_DNS_NUM_TYPES + 1) : 0); 
type  (addtl_recs ? (PHP_DNS_NUM_TYPES + 2) : PHP_DNS_NUM_TYPES) || 
first_query; type++)
-   {
+   for (type = (type_param == PHP_DNS_ANY ? (PHP_DNS_NUM_TYPES + 1) : 0);
+   type  (addtl_recs ? (PHP_DNS_NUM_TYPES + 2) : 
PHP_DNS_NUM_TYPES) || first_query;
+   type++
+   ) {
first_query = 0;
switch (type) {
-   case 0: 
+   case 0:
type_to_fetch = type_paramPHP_DNS_A

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 13:42:16 2007 UTC

  Modified files:  
/php-src/ext/standard   dns.c 
  Log:
  nuke compile warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.87r2=1.88diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.87 php-src/ext/standard/dns.c:1.88
--- php-src/ext/standard/dns.c:1.87 Mon Nov  5 13:40:36 2007
+++ php-src/ext/standard/dns.c  Mon Nov  5 13:42:16 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.87 2007/11/05 13:40:36 jani Exp $ */
+/* $Id: dns.c,v 1.88 2007/11/05 13:42:16 jani Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -678,7 +678,7 @@
}
 
if (type_param  ~PHP_DNS_ALL  type_param != PHP_DNS_ANY) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Type '%d' not 
supported, type_param);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Type '%ld' not 
supported, type_param);
RETURN_FALSE;
}
 

-- 
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/standard dns.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 13:42:33 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   dns.c 
  Log:
  MFH: Sync
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5r2=1.70.2.7.2.5.2.1diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5 
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.1
--- php-src/ext/standard/dns.c:1.70.2.7.2.5 Tue Jun 26 11:04:55 2007
+++ php-src/ext/standard/dns.c  Mon Nov  5 13:42:33 2007
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: dns.c,v 1.70.2.7.2.5 2007/06/26 11:04:55 tony2001 Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.1 2007/11/05 13:42:33 jani Exp $ */
 
 /* {{{ includes */
 #include php.h
@@ -33,7 +33,7 @@
 #define WINNT 1
 #endif
 /* located in www.php.net/extra/bindlib.zip */
-#if HAVE_ARPA_INET_H 
+#if HAVE_ARPA_INET_H
 #include arpa/inet.h
 #endif
 #include netdb.h
@@ -123,18 +123,17 @@
Get the Internet host name corresponding to a given IP address */
 PHP_FUNCTION(gethostbyaddr)
 {
-   zval **arg;
-   char *addr; 
-   
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE) 
{
-   ZEND_WRONG_PARAM_COUNT();
+   char *addr;
+   int addr_len;
+   char *hostname;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, addr, 
addr_len) == FAILURE) {
+   return;
}
 
-   convert_to_string_ex(arg);
-   
-   addr = php_gethostbyaddr(Z_STRVAL_PP(arg));
+   hostname = php_gethostbyaddr(addr);
 
-   if (addr == NULL) {
+   if (hostname == NULL) {
 #if HAVE_IPV6  HAVE_INET_PTON
php_error_docref(NULL TSRMLS_CC, E_WARNING, Address is not a 
valid IPv4 or IPv6 address);
 #else
@@ -142,7 +141,7 @@
 #endif
RETVAL_FALSE;
} else {
-   RETVAL_STRING(addr, 0);
+   RETVAL_STRING(hostname, 0);
}
 }
 /* }}} */
@@ -186,15 +185,17 @@
Get the IP address corresponding to a given Internet host name */
 PHP_FUNCTION(gethostbyname)
 {
-   zval **arg;
-   
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE) 
{
-   ZEND_WRONG_PARAM_COUNT();
+   char *hostname;
+   int hostname_len;
+   char *addr;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, hostname, 
hostname_len) == FAILURE) {
+   return;
}
 
-   convert_to_string_ex(arg);
+   addr = php_gethostbyname(hostname);
 
-   RETVAL_STRING(php_gethostbyname(Z_STRVAL_PP(arg)), 0);
+   RETVAL_STRING(addr, 0);
 }
 /* }}} */
 
@@ -202,17 +203,17 @@
Return a list of IP addresses that a given hostname resolves to. */
 PHP_FUNCTION(gethostbynamel)
 {
-   zval **arg;
+   char *hostname;
+   int hostname_len;
struct hostent *hp;
struct in_addr in;
int i;
 
-   if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, arg) == FAILURE) 
{
-   ZEND_WRONG_PARAM_COUNT();
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, hostname, 
hostname_len) == FAILURE) {
+   return;
}
-   convert_to_string_ex(arg);
 
-   hp = gethostbyname(Z_STRVAL_PP(arg));
+   hp = gethostbyname(hostname);
if (hp == NULL || hp-h_addr_list == NULL) {
RETURN_FALSE;
}
@@ -250,62 +251,43 @@
Check DNS records corresponding to a given Internet host name or IP address 
*/
 PHP_FUNCTION(dns_check_record)
 {
-   zval **arg1, **arg2;
-   int type, i;
 #ifndef MAXPACKET
 #define MAXPACKET  8192 /* max packet size used internally by BIND */
 #endif
u_char ans[MAXPACKET];
-   
-   switch (ZEND_NUM_ARGS()) {
-   case 1:
-   if (zend_get_parameters_ex(1, arg1) == FAILURE) {
-   WRONG_PARAM_COUNT;
-   }
-   type = T_MX;
-   convert_to_string_ex(arg1);
-   
-   if (Z_STRLEN_PP(arg1) == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Host cannot be empty);
-   RETURN_FALSE;
-   }
-   break;
+   char *hostname, *rectype = NULL;
+   int hostname_len, rectype_len = 0;
+   int type = T_MX, i;
 
-   case 2:
-   if (zend_get_parameters_ex(2, arg1, arg2) == FAILURE) 
{
-   WRONG_PARAM_COUNT;
-   }
-   convert_to_string_ex(arg1);
-   convert_to_string_ex(arg2);
-
-   if (Z_STRLEN_PP(arg1) == 0 || Z_STRLEN_PP(arg2) == 0) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Host and type cannot be empty);
-   RETURN_FALSE;
-

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 14:06:19 2007 UTC

  Modified files:  
/php-src/ext/standard   exec.c exec.h 
  Log:
  ws + cs + missing PHPAPIs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.124r2=1.125diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.124 php-src/ext/standard/exec.c:1.125
--- php-src/ext/standard/exec.c:1.124   Sat Jul 14 08:38:19 2007
+++ php-src/ext/standard/exec.c Mon Nov  5 14:06:19 2007
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
  */
-/* $Id: exec.c,v 1.124 2007/07/14 08:38:19 tony2001 Exp $ */
+/* $Id: exec.c,v 1.125 2007/11/05 14:06:19 jani Exp $ */
 
 #include stdio.h
 #include php.h
@@ -57,7 +57,7 @@
  *
  * Unicode command strings are encoding using filesystem_encoding, returned 
data is not decoded back to unicode
  */
-int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
+PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value 
TSRMLS_DC)
 {
FILE *fp;
char *buf;
@@ -92,7 +92,7 @@
 
if (type != 3) {
b = buf;
-   
+
while (php_stream_get_line(stream, ZSTR(b), EXEC_INPUT_BUF, 
bufl)) {
/* no new line found, let's read some more */
if (b[bufl - 1] != '\n'  !php_stream_eof(stream)) {
@@ -113,7 +113,7 @@
PHPWRITE(buf, bufl);
sapi_flush(TSRMLS_C);
} else if (type == 2) {
-   /* strip trailing whitespaces */
+   /* strip trailing whitespaces */
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
if (l != (bufl - 1)) {
@@ -125,7 +125,7 @@
b = buf;
}
if (bufl) {
-   /* strip trailing whitespaces if we have not done so 
already */ 
+   /* strip trailing whitespaces if we have not done so 
already */
if (type != 2) {
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
@@ -146,7 +146,7 @@
}
}
 
-   pclose_return = php_stream_close(stream); 
+   pclose_return = php_stream_close(stream);
efree(buf);
 
 done:
@@ -219,7 +219,6 @@
 {
php_exec_ex(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
-
 /* }}} */
 
 /* {{{ proto int system(string command [, int return_value]) U
@@ -247,14 +246,15 @@
 
*NOT* safe for binary strings
 */
-char *php_escape_shell_cmd(char *str) {
+PHPAPI char *php_escape_shell_cmd(char *str)
+{
register int x, y, l = strlen(str);
char *cmd;
char *p = NULL;
size_t estimate = (2 * l) + 1;
 
cmd = safe_emalloc(2, l, 1);
-   
+
for (x = 0, y = 0; x  l; x++) {
switch (str[x]) {
case '':
@@ -318,13 +318,14 @@
 
 /* {{{ php_escape_shell_arg
  */
-char *php_escape_shell_arg(char *str) {
+PHPAPI char *php_escape_shell_arg(char *str)
+{
int x, y = 0, l = strlen(str);
char *cmd;
size_t estimate = (4 * l) + 3;
 
cmd = safe_emalloc(4, l, 3); /* worst case */
-   
+
 #ifdef PHP_WIN32
cmd[y++] = '';
 #else
@@ -415,7 +416,7 @@
RETURN_FALSE;
}
}
-   
+
if (argument) {
cmd = php_escape_shell_arg(argument);
RETVAL_STRING(cmd, 0);
@@ -460,8 +461,8 @@
 
stream = php_stream_fopen_from_pipe(in, rb);
total_readbytes = php_stream_copy_to_mem(stream, ret, 
PHP_STREAM_COPY_ALL, 0);
-   php_stream_close(stream); 
-   
+   php_stream_close(stream);
+
if (total_readbytes  0) {
RETVAL_STRINGL(ret, total_readbytes, 0);
}
@@ -489,7 +490,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Only a super user 
may attempt to increase the priority of a process);
RETURN_FALSE;
}
-   
+
RETURN_TRUE;
 }
 /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.h?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/standard/exec.h
diff -u php-src/ext/standard/exec.h:1.28 php-src/ext/standard/exec.h:1.29
--- php-src/ext/standard/exec.h:1.28Mon Jan  1 09:29:31 2007
+++ php-src/ext/standard/exec.h Mon Nov  5 14:06:19 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: exec.h,v 1.28 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: exec.h,v 1.29 2007/11/05 14:06:19 jani Exp $ */
 
 #ifndef EXEC_H
 #define EXEC_H
@@ -36,6 +36,6 @@
 
 PHPAPI char *php_escape_shell_cmd(char *);
 PHPAPI

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard exec.c exec.h

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 14:06:53 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   exec.c exec.h 
  Log:
  MFH: sync
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.1r2=1.113.2.3.2.1.2.2diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.1 
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.2
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.1   Sun Sep 30 05:49:44 2007
+++ php-src/ext/standard/exec.c Mon Nov  5 14:06:53 2007
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
  */
-/* $Id: exec.c,v 1.113.2.3.2.1.2.1 2007/09/30 05:49:44 jani Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.2 2007/11/05 14:06:53 jani Exp $ */
 
 #include stdio.h
 #include php.h
@@ -57,7 +57,7 @@
  * If type==3, output will be printed binary, no lines will be saved or 
returned (passthru)
  *
  */
-int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
+PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value 
TSRMLS_DC)
 {
FILE *fp;
char *buf, *tmp=NULL;
@@ -111,7 +111,7 @@
 
if (type != 3) {
b = buf;
-   
+
while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, bufl)) {
/* no new line found, let's read some more */
if (b[bufl - 1] != '\n'  !php_stream_eof(stream)) {
@@ -132,7 +132,7 @@
PHPWRITE(buf, bufl);
sapi_flush(TSRMLS_C);
} else if (type == 2) {
-   /* strip trailing whitespaces */
+   /* strip trailing whitespaces */
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
if (l != (int)(bufl - 1)) {
@@ -144,7 +144,7 @@
b = buf;
}
if (bufl) {
-   /* strip trailing whitespaces if we have not done so 
already */ 
+   /* strip trailing whitespaces if we have not done so 
already */
if (type != 2) {
l = bufl;
while (l--  isspace(((unsigned char 
*)buf)[l]));
@@ -157,7 +157,7 @@
/* Return last line from the shell command */
if (PG(magic_quotes_runtime)) {
int len;
-   
+
tmp = php_addslashes(buf, bufl, len, 0 
TSRMLS_CC);
RETVAL_STRINGL(tmp, len, 0);
} else {
@@ -172,7 +172,7 @@
}
}
 
-   pclose_return = php_stream_close(stream); 
+   pclose_return = php_stream_close(stream);
efree(buf);
 
 done:
@@ -191,7 +191,7 @@
 }
 /* }}} */
 
-static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode)
+static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 {
char *cmd;
int cmd_len;
@@ -226,6 +226,7 @@
ZVAL_LONG(ret_code, ret);
}
 }
+/* }}} */
 
 /* {{{ proto string exec(string command [, array output [, int 
return_value]])
Execute an external program */
@@ -233,7 +234,6 @@
 {
php_exec_ex(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
-
 /* }}} */
 
 /* {{{ proto int system(string command [, int return_value])
@@ -261,14 +261,15 @@
 
*NOT* safe for binary strings
 */
-char *php_escape_shell_cmd(char *str) {
-   register int x, y, l;
+PHPAPI char *php_escape_shell_cmd(char *str)
+{
+   register int x, y, l = strlen(str);
char *cmd;
char *p = NULL;
+   size_t estimate = (2 * l) + 1;
 
-   l = strlen(str);
cmd = safe_emalloc(2, l, 1);
-   
+
for (x = 0, y = 0; x  l; x++) {
switch (str[x]) {
case '':
@@ -319,21 +320,27 @@
}
}
cmd[y] = '\0';
+
+   if ((estimate - y)  4096) {
+   /* realloc if the estimate was way overill
+* Arbitrary cutoff point of 4096 */
+   cmd = erealloc(cmd, y + 1);
+   }
+
return cmd;
 }
 /* }}} */
 
 /* {{{ php_escape_shell_arg
  */
-char *php_escape_shell_arg(char *str) {
-   int x, y, l;
+PHPAPI char *php_escape_shell_arg(char *str)
+{
+   int x, y = 0, l = strlen(str);
char *cmd;
+   size_t estimate = (4 * l) + 3;
 
-   y = 0;
-   l = strlen(str);
-   
cmd = safe_emalloc(4, l, 3); /* worst case */
-   
+
 #ifdef PHP_WIN32
cmd[y++] = '';
 #else
@@ -364,6 +371,12 @@
cmd[y++] = '\'';
 #endif
cmd[y] = '\0';
+
+   if ((estimate - y)  4096) {
+   /* realloc if

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 15:24:25 2007 UTC

  Modified files:  
/php-src/ext/standard   file.c 
  Log:
  ws + cs
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.502r2=1.503diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.502 php-src/ext/standard/file.c:1.503
--- php-src/ext/standard/file.c:1.502   Sat Oct  6 21:15:46 2007
+++ php-src/ext/standard/file.c Mon Nov  5 15:24:25 2007
@@ -19,9 +19,9 @@
| PHP 4.0 patches by Thies C. Arntzen ([EMAIL PROTECTED])   |
| PHP streams by Wez Furlong ([EMAIL PROTECTED])|
+--+
- */
+*/
 
-/* $Id: file.c,v 1.502 2007/10/06 21:15:46 tony2001 Exp $ */
+/* $Id: file.c,v 1.503 2007/11/05 15:24:25 jani Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -146,11 +146,10 @@
 {
return le_stream_context;
 }
-
 /* }}} */
 
-/* {{{ Module-Stuff */
-
+/* {{{ Module-Stuff
+*/
 static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
 {
php_stream_context *context = (php_stream_context*)rsrc-ptr;
@@ -172,7 +171,6 @@
 {
 }
 
-
 PHP_INI_BEGIN()
STD_PHP_INI_ENTRY(user_agent, NULL, PHP_INI_ALL, OnUpdateString, 
user_agent, php_file_globals, file_globals)
STD_PHP_INI_ENTRY(default_socket_timeout, 60, PHP_INI_ALL, 
OnUpdateLong, default_socket_timeout, php_file_globals, file_globals)
@@ -190,7 +188,7 @@
 #endif
 
REGISTER_INI_ENTRIES();
-   
+
REGISTER_LONG_CONSTANT(SEEK_SET, SEEK_SET, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SEEK_CUR, SEEK_CUR, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SEEK_END, SEEK_END, CONST_CS | 
CONST_PERSISTENT);
@@ -209,7 +207,7 @@
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_FAILURE, 
PHP_STREAM_NOTIFY_FAILURE,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_COMPLETED,   
PHP_STREAM_NOTIFY_COMPLETED,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_RESOLVE, 
PHP_STREAM_NOTIFY_RESOLVE,  CONST_CS | CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO,   
PHP_STREAM_NOTIFY_SEVERITY_INFO,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_WARN,   
PHP_STREAM_NOTIFY_SEVERITY_WARN,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_ERR,
PHP_STREAM_NOTIFY_SEVERITY_ERR, CONST_CS | CONST_PERSISTENT);
@@ -230,7 +228,7 @@
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_SSLv3_SERVER, 
STREAM_CRYPTO_METHOD_SSLv3_SERVER,  CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_SSLv23_SERVER,
STREAM_CRYPTO_METHOD_SSLv23_SERVER, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_TLS_SERVER,   
STREAM_CRYPTO_METHOD_TLS_SERVER,CONST_CS|CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(STREAM_SHUT_RD,STREAM_SHUT_RD, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SHUT_WR,STREAM_SHUT_WR, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SHUT_RDWR,  STREAM_SHUT_RDWR,   
CONST_CS|CONST_PERSISTENT);
@@ -284,7 +282,7 @@
 
REGISTER_LONG_CONSTANT(STREAM_SERVER_BIND,
STREAM_XPORT_BIND,  CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SERVER_LISTEN,  
STREAM_XPORT_LISTEN,CONST_CS | CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(FILE_USE_INCLUDE_PATH, 
PHP_FILE_USE_INCLUDE_PATH,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_IGNORE_NEW_LINES, 
PHP_FILE_IGNORE_NEW_LINES,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_SKIP_EMPTY_LINES, 
PHP_FILE_SKIP_EMPTY_LINES,  CONST_CS | CONST_PERSISTENT);
@@ -304,7 +302,6 @@
 
return SUCCESS;
 }
-
 /* }}} */
 
 PHP_MSHUTDOWN_FUNCTION(file) /* {{{ */
@@ -316,11 +313,10 @@
 }
 /* }}} */
 
-/* {{{ proto bool flock(resource fp, int operation [, int wouldblock]) U
-   Portable file locking */
-
 static int flock_values[] = { LOCK_SH, LOCK_EX, LOCK_UN };
 
+/* {{{ proto bool flock(resource fp, int operation [, int wouldblock]) U
+   Portable file locking */
 PHP_FUNCTION(flock)
 {
zval *arg1, *arg3 = NULL;
@@ -355,14 +351,12 @@
}
RETURN_TRUE;
 }
-
 /* }}} */
 
 #define PHP_META_UNSAFE .\\+*?[^]$() 
 
 /* {{{ proto array get_meta_tags(string filename [, bool use_include_path]) U
Extracts all meta tag content attributes from a file and returns an array */
-
 PHP_FUNCTION(get_meta_tags)
 {
zval

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 16:14:11 2007 UTC

  Modified files:  
/php-src/ext/standard   filestat.c 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.166r2=1.167diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.166 
php-src/ext/standard/filestat.c:1.167
--- php-src/ext/standard/filestat.c:1.166   Mon Nov  5 16:12:55 2007
+++ php-src/ext/standard/filestat.c Mon Nov  5 16:14:11 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.166 2007/11/05 16:12:55 jani Exp $ */
+/* $Id: filestat.c,v 1.167 2007/11/05 16:14:11 jani Exp $ */
 
 #include php.h
 #include fopen_wrappers.h
@@ -439,7 +439,7 @@
struct group *retgrptr;
long grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
char *grbuf;
-   
+
if (grbuflen  1) {
RETURN_FALSE;
}

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

[PHP-CVS] cvs: php-src /ext/standard/tests/array sort_object2.phpt

2007-11-05 Thread Raghubansh Kumar

kraghubaMon Nov  5 16:19:55 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/array   sort_object2.phpt 
  Log:
  Fix test title
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_object2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/array/sort_object2.phpt
diff -u php-src/ext/standard/tests/array/sort_object2.phpt:1.1 
php-src/ext/standard/tests/array/sort_object2.phpt:1.2
--- php-src/ext/standard/tests/array/sort_object2.phpt:1.1  Mon Nov  5 
15:17:10 2007
+++ php-src/ext/standard/tests/array/sort_object2.phpt  Mon Nov  5 16:19:55 2007
@@ -1,9 +1,5 @@
 --TEST--
- .mine
-Test sort() function : object functionality - sorting objects with diff. 
accessiblity of member vars 
-===
-Test sort() function : usage variations - sorting objects with diff. 
accessiblity of member vars
- .r17831
+Test sort() function : object functionality - sorting objects with diff. 
accessibility of member vars 
 --FILE--
 ?php
 /* Prototype  : bool sort ( array $array [, int $sort_flags] )

-- 
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/standard/tests/array sort_object2.phpt

2007-11-05 Thread Raghubansh Kumar

kraghubaMon Nov  5 16:22:37 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/array   sort_object2.phpt 
  Log:
  fix typo in title
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_object2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/array/sort_object2.phpt
diff -u php-src/ext/standard/tests/array/sort_object2.phpt:1.1.2.2 
php-src/ext/standard/tests/array/sort_object2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/sort_object2.phpt:1.1.2.2  Mon Nov  5 
15:30:49 2007
+++ php-src/ext/standard/tests/array/sort_object2.phpt  Mon Nov  5 16:22:37 2007
@@ -1,5 +1,5 @@
 --TEST--
-Test sort() function : object functionality - sorting objects with diff. 
accessiblity of member vars
+Test sort() function : object functionality - sorting objects with diff. 
accessibility of member vars
 --FILE--
 ?php
 /* Prototype  : bool sort ( array $array [, int $sort_flags] )

-- 
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/standard/tests/array sort_object2.phpt

2007-11-05 Thread Raghubansh Kumar

kraghubaMon Nov  5 16:24:37 2007 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard/tests/array   sort_object2.phpt 
  Log:
  better test title
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/sort_object2.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/array/sort_object2.phpt
diff -u php-src/ext/standard/tests/array/sort_object2.phpt:1.1.4.2 
php-src/ext/standard/tests/array/sort_object2.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/sort_object2.phpt:1.1.4.2  Mon Nov  5 
15:38:03 2007
+++ php-src/ext/standard/tests/array/sort_object2.phpt  Mon Nov  5 16:24:37 2007
@@ -1,5 +1,5 @@
 --TEST--
-Test sort() function : object functionality - sorting objects, with diff. 
visibility modes, 'sort_flags' as defualt/SORT_REGULAR
+Test sort() function : object functionality - sorting objects with diff. 
accessibility of member vars
 --FILE--
 ?php
 /* Prototype  : bool sort ( array $array [, int $sort_flags] )

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

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 16:29:04 2007 UTC

  Modified files:  
/php-src/ext/standard   filestat.c 
  Log:
  ws
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.167r2=1.168diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.167 
php-src/ext/standard/filestat.c:1.168
--- php-src/ext/standard/filestat.c:1.167   Mon Nov  5 16:14:11 2007
+++ php-src/ext/standard/filestat.c Mon Nov  5 16:29:04 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.167 2007/11/05 16:14:11 jani Exp $ */
+/* $Id: filestat.c,v 1.168 2007/11/05 16:29:04 jani Exp $ */
 
 #include php.h
 #include fopen_wrappers.h
@@ -1081,7 +1081,6 @@
efree(filename); \
} \
 }
-
 /* }}} */
 
 /* {{{ proto int fileperms(string filename) U

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file flock_error.phpt

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 17:09:26 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/fileflock_error.phpt 
  Log:
  - Fix expected result. This has hidden an obvious bug..
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/flock_error.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/flock_error.phpt
diff -u php-src/ext/standard/tests/file/flock_error.phpt:1.3 
php-src/ext/standard/tests/file/flock_error.phpt:1.4
--- php-src/ext/standard/tests/file/flock_error.phpt:1.3Wed Jul 11 
12:57:55 2007
+++ php-src/ext/standard/tests/file/flock_error.phptMon Nov  5 17:09:26 2007
@@ -91,10 +91,8 @@
 NULL
 
 --- Iteration 8 ---
-Notice: A non well formed numeric value encountered in %s on line %d
-
-Warning: flock(): Illegal operation argument in %s on line %d
-bool(false)
+Warning: flock() expects parameter 2 to be long, string given in %s on line %d
+NULL
 
 Warning: flock(): 6 is not a valid stream resource in %s on line %d
 bool(false)
@@ -148,10 +146,8 @@
 NULL
 
 --- Iteration 8 ---
-Notice: A non well formed numeric value encountered in %s on line %d
-
-Warning: flock(): Illegal operation argument in %s on line %d
-bool(false)
+Warning: flock() expects parameter 2 to be long, string given in %s on line %d
+NULL
 
 Warning: flock(): 6 is not a valid stream resource in %s on line %d
 bool(false)

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file tempnam_variation3.phpt

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 17:24:00 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filetempnam_variation3.phpt 
  Log:
  - Fix another wrong expected result
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation3.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/tempnam_variation3.phpt
diff -u php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.3 
php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.4
--- php-src/ext/standard/tests/file/tempnam_variation3.phpt:1.3 Fri Aug 10 
12:10:19 2007
+++ php-src/ext/standard/tests/file/tempnam_variation3.phpt Mon Nov  5 
17:24:00 2007
@@ -78,7 +78,10 @@
 File permissions are = 100600
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: tempnam() expects parameter 2 to be string, array given in %s on line 
%d
+-- File is not created --
+
+Warning: unlink(): No such file or directory in %s on line %d
 File name is = %s
 File permissions are = 100600
 -- Iteration 8 --
@@ -111,9 +114,10 @@
 File permissions are = 100600
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
-File name is = %s
-File permissions are = 100600
+Warning: tempnam() expects parameter 2 to be string, array given in %s on line 
%d
+-- File is not created --
+
+Warning: unlink(): No such file or directory in %s on line %d
 -- Iteration 8 --
 File name is = %s
 File permissions are = 100600

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

[PHP-CVS] cvs: php-src /ext/standard/tests/file tempnam_variation7.phpt

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 17:28:58 2007 UTC

  Modified files:  
/php-src/ext/standard/tests/filetempnam_variation7.phpt 
  Log:
  - Fix another wrong expected result (this is a bug!)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_variation7.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/tempnam_variation7.phpt
diff -u php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.3 
php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.4
--- php-src/ext/standard/tests/file/tempnam_variation7.phpt:1.3 Fri Aug 10 
12:10:19 2007
+++ php-src/ext/standard/tests/file/tempnam_variation7.phpt Mon Nov  5 
17:28:58 2007
@@ -79,7 +79,10 @@
 File permissions are = 100600
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: tempnam() expects parameter 1 to be string, array given in %s on line 
%d
+-- File is not created --
+
+Warning: unlink(): No such file or directory in %s on line %d
 File name is = %s
 File permissions are = 100600
 -- Iteration 8 --
@@ -112,7 +115,10 @@
 File permissions are = 100600
 -- Iteration 7 --
 
-Notice: Array to string conversion in %s on line %d
+Warning: tempnam() expects parameter 1 to be string, array given in %s on line 
%d
+-- File is not created --
+
+Warning: unlink(): No such file or directory in %s on line %d
 File name is = %s
 File permissions are = 100600
 -- Iteration 8 --

-- 
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/standard filestat.c

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 17:30:08 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   filestat.c 
  Log:
  MFH: sync
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.14.2.1r2=1.136.2.8.2.14.2.2diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.1 
php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.2
--- php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.1  Wed Oct 31 13:22:44 2007
+++ php-src/ext/standard/filestat.c Mon Nov  5 17:30:07 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: filestat.c,v 1.136.2.8.2.14.2.1 2007/10/31 13:22:44 jani Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.14.2.2 2007/11/05 17:30:07 jani Exp $ */
 
 #include php.h
 #include safe_mode.h
@@ -106,7 +106,7 @@
 }
 /* }}} */
 
-PHP_RSHUTDOWN_FUNCTION(filestat) /* {{{ */ 
+PHP_RSHUTDOWN_FUNCTION(filestat) /* {{{ */
 {
if (BG(CurrentStatFile)) {
efree (BG(CurrentStatFile));
@@ -174,9 +174,9 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to load 
kernel32.dll);
return FAILURE;
}
-   
+
*space = bytestotal;
-   return SUCCESS; 
+   return SUCCESS;
 }
 /* }}} */
 #elif defined(OS2) /* {{{ */
@@ -197,9 +197,9 @@
 {
double bytestotal = 0;
 #if defined(HAVE_SYS_STATVFS_H)  defined(HAVE_STATVFS)
-struct statvfs buf;
+   struct statvfs buf;
 #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H))  
defined(HAVE_STATFS)
-struct statfs buf;
+   struct statfs buf;
 #endif
 
 #if defined(HAVE_SYS_STATVFS_H)  defined(HAVE_STATVFS)
@@ -252,7 +252,7 @@
 /* }}} */
 
 static int php_disk_free_space(char *path, double *space TSRMLS_DC) /* {{{ */
-#if defined(WINDOWS) /* {{{ */ 
+#if defined(WINDOWS) /* {{{ */
 {
double bytesfree = 0;
 
@@ -282,9 +282,9 @@
if (gdfse) {
func = (gdfse_func)gdfse;
if (func(path,
-   FreeBytesAvailableToCaller,
-   TotalNumberOfBytes,
-   TotalNumberOfFreeBytes) == 0) { 
+   FreeBytesAvailableToCaller,
+   TotalNumberOfBytes,
+   TotalNumberOfFreeBytes) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
%s, php_win_err());
return FAILURE;
}
@@ -295,8 +295,8 @@
FreeBytesAvailableToCaller.LowPart;
} else { /* If it's not available, we just use GetDiskFreeSpace 
*/
if (GetDiskFreeSpace(path,
-   SectorsPerCluster, BytesPerSector,
-   NumberOfFreeClusters, TotalNumberOfClusters) 
== 0) { 
+   SectorsPerCluster, 
BytesPerSector,
+   NumberOfFreeClusters, 
TotalNumberOfClusters) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
%s, php_win_err());
return FAILURE;
}
@@ -321,7 +321,7 @@
bytesfree = (double)fsinfo.cbSector * fsinfo.cSectorUnit * 
fsinfo.cUnitAvail;
*space = bytesfree;
return SUCCESS;
-   } 
+   }
return FAILURE;
 }
 /* }}} */
@@ -355,7 +355,7 @@
bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail));
 #endif
 #endif
-   
+
*space = bytesfree;
return SUCCESS;
 }
@@ -389,15 +389,19 @@
 #if !defined(WINDOWS)
 static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */
 {
-   zval **filename, **group;
+   char *filename;
+   int filename_len;
+   zval *group;
gid_t gid;
int ret;
 
-   if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, filename, 
group)==FAILURE) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz/, filename, 
filename_len, group) == FAILURE) {
+   return;
}
-   convert_to_string_ex(filename);
-   if (Z_TYPE_PP(group) == IS_STRING) {
+
+   if (Z_TYPE_P(group) == IS_LONG) {
+   gid = (gid_t)Z_LVAL_P(group);
+   } else {
 #if defined(ZTS)  defined(HAVE_GETGRNAM_R)  defined(_SC_GETGR_R_SIZE_MAX)
struct group gr;
struct group *retgrptr;
@@ -409,42 +413,39 @@
}
 
grbuf = emalloc(grbuflen);
-   if (getgrnam_r(Z_STRVAL_PP(group), gr, grbuf, grbuflen, 
retgrptr) != 0 || retgrptr == NULL) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to 
find gid for %s, Z_STRVAL_PP(group));
+

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

2007-11-05 Thread Jani Taskinen

janiMon Nov  5 17:43:05 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   file.c 
  Log:
  MFH: Sync
  [DOC]: note
  [DOC] -/* {{{ proto bool copy(string source_file, string destination_file)
  [DOC] +/* {{{ proto bool copy(string source_file, string destination_file [, 
resource context])
  [DOC]
  [DOC] Apparently this was undocumented so far anyway..
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.1r2=1.409.2.6.2.28.2.2diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.1 
php-src/ext/standard/file.c:1.409.2.6.2.28.2.2
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.1  Wed Oct  3 10:44:32 2007
+++ php-src/ext/standard/file.c Mon Nov  5 17:43:04 2007
@@ -19,9 +19,9 @@
| PHP 4.0 patches by Thies C. Arntzen ([EMAIL PROTECTED])   |
| PHP streams by Wez Furlong ([EMAIL PROTECTED])|
+--+
- */
+*/
 
-/* $Id: file.c,v 1.409.2.6.2.28.2.1 2007/10/03 10:44:32 dsp Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.2 2007/11/05 17:43:04 jani Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -147,11 +147,10 @@
 {
return le_stream_context;
 }
-
 /* }}} */
 
-/* {{{ Module-Stuff */
-
+/* {{{ Module-Stuff
+*/
 static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
 {
php_stream_context *context = (php_stream_context*)rsrc-ptr;
@@ -173,7 +172,6 @@
 {
 }
 
-
 PHP_INI_BEGIN()
STD_PHP_INI_ENTRY(user_agent, NULL, PHP_INI_ALL, OnUpdateString, 
user_agent, php_file_globals, file_globals)
STD_PHP_INI_ENTRY(default_socket_timeout, 60, PHP_INI_ALL, 
OnUpdateLong, default_socket_timeout, php_file_globals, file_globals)
@@ -191,7 +189,7 @@
 #endif
 
REGISTER_INI_ENTRIES();
-   
+
REGISTER_LONG_CONSTANT(SEEK_SET, SEEK_SET, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SEEK_CUR, SEEK_CUR, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SEEK_END, SEEK_END, CONST_CS | 
CONST_PERSISTENT);
@@ -210,7 +208,7 @@
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_FAILURE, 
PHP_STREAM_NOTIFY_FAILURE,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_COMPLETED,   
PHP_STREAM_NOTIFY_COMPLETED,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_RESOLVE, 
PHP_STREAM_NOTIFY_RESOLVE,  CONST_CS | CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_INFO,   
PHP_STREAM_NOTIFY_SEVERITY_INFO,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_WARN,   
PHP_STREAM_NOTIFY_SEVERITY_WARN,CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_NOTIFY_SEVERITY_ERR,
PHP_STREAM_NOTIFY_SEVERITY_ERR, CONST_CS | CONST_PERSISTENT);
@@ -231,7 +229,7 @@
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_SSLv3_SERVER, 
STREAM_CRYPTO_METHOD_SSLv3_SERVER,  CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_SSLv23_SERVER,
STREAM_CRYPTO_METHOD_SSLv23_SERVER, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_CRYPTO_METHOD_TLS_SERVER,   
STREAM_CRYPTO_METHOD_TLS_SERVER,CONST_CS|CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(STREAM_SHUT_RD,STREAM_SHUT_RD, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SHUT_WR,STREAM_SHUT_WR, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SHUT_RDWR,  STREAM_SHUT_RDWR,   
CONST_CS|CONST_PERSISTENT);
@@ -285,13 +283,13 @@
 
REGISTER_LONG_CONSTANT(STREAM_SERVER_BIND,
STREAM_XPORT_BIND,  CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(STREAM_SERVER_LISTEN,  
STREAM_XPORT_LISTEN,CONST_CS | CONST_PERSISTENT);
-   
+
REGISTER_LONG_CONSTANT(FILE_USE_INCLUDE_PATH, 
PHP_FILE_USE_INCLUDE_PATH,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_IGNORE_NEW_LINES, 
PHP_FILE_IGNORE_NEW_LINES,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_SKIP_EMPTY_LINES, 
PHP_FILE_SKIP_EMPTY_LINES,  CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_APPEND,   
PHP_FILE_APPEND,CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(FILE_NO_DEFAULT_CONTEXT,   
PHP_FILE_NO_DEFAULT_CONTEXT,CONST_CS | CONST_PERSISTENT);
-   
+
 #ifdef HAVE_FNMATCH
REGISTER_LONG_CONSTANT(FNM_NOESCAPE, FNM_NOESCAPE, CONST_CS |

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

2007-11-05 Thread Ilia Alshanetsky

iliaa   Mon Nov  5 23:53:23 2007 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   array.c 
  Log:
  Fixed bug #43197 (array_intersect_assoc() does not emit warning messages for
  error inputs)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.6r2=1.308.2.21.2.37.2.7diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.6 
php-src/ext/standard/array.c:1.308.2.21.2.37.2.7
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.6Fri Nov  2 19:40:38 2007
+++ php-src/ext/standard/array.cMon Nov  5 23:53:23 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.37.2.6 2007/11/02 19:40:38 jani Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.7 2007/11/05 23:53:23 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2749,11 +2749,13 @@
argc = ZEND_NUM_ARGS();
if (data_compare_type == INTERSECT_COMP_DATA_USER) {
if (argc  3 || zend_parse_parameters(ZEND_NUM_ARGS() 
TSRMLS_CC, +f, args, argc, BG(user_compare_fci), 
BG(user_compare_fci_cache)) == FAILURE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, at least 3 
parameters are required, %d given, ZEND_NUM_ARGS());
return;
}
intersect_data_compare_func = zval_user_compare;
} else {
if (argc  2 || zend_parse_parameters(ZEND_NUM_ARGS() 
TSRMLS_CC, +, args, argc) == FAILURE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, at least 2 
parameters are required, %d given, ZEND_NUM_ARGS());
return;
}
if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {

-- 
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

2007-11-05 Thread Ilia Alshanetsky

iliaa   Mon Nov  5 23:55:21 2007 UTC

  Modified files:  
/php-src/ext/standard   array.c 
  Log:
  MFB: Fixed bug #43197 (array_intersect_assoc() does not emit warning
  messages for error inputs)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.427r2=1.428diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.427 php-src/ext/standard/array.c:1.428
--- php-src/ext/standard/array.c:1.427  Fri Nov  2 16:19:31 2007
+++ php-src/ext/standard/array.cMon Nov  5 23:55:21 2007
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.427 2007/11/02 16:19:31 jani Exp $ */
+/* $Id: array.c,v 1.428 2007/11/05 23:55:21 iliaa Exp $ */
 
 #include php.h
 #include php_ini.h
@@ -2973,11 +2973,13 @@
argc = ZEND_NUM_ARGS();
if (data_compare_type == INTERSECT_COMP_DATA_USER) {
if (argc  3 || zend_parse_parameters(ZEND_NUM_ARGS() 
TSRMLS_CC, +f, args, argc, BG(user_compare_fci), 
BG(user_compare_fci_cache)) == FAILURE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, at least 3 
parameters are required, %d given, ZEND_NUM_ARGS());
return;
}
intersect_data_compare_func = zval_user_compare;
} else {
if (argc  2 || zend_parse_parameters(ZEND_NUM_ARGS() 
TSRMLS_CC, +, args, argc) == FAILURE) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, at least 2 
parameters are required, %d given, ZEND_NUM_ARGS());
return;
}
if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {

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

[PHP-CVS] cvs: CVSROOT / avail

2007-11-05 Thread Andrei Zmievski

andrei  Tue Nov  6 02:03:39 2007 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  Give Bob Majdak (bmajdak) access to PHP-GTK.
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1321r2=1.1322diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1321 CVSROOT/avail:1.1322
--- CVSROOT/avail:1.1321Mon Nov  5 03:44:47 2007
+++ CVSROOT/avail   Tue Nov  6 02:03:38 2007
@@ -101,7 +101,7 @@
 
 # The PHP-GTK Group has access to the PHP-GTK code and documentation.
 
-avail|fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose|php-gtk,php-gtk-doc
+avail|fmk,mfischer,alan_k,amaza,descript,cweiske,jani,pablo,sfox,jsjohnst,jp,anant,scottmattocks,auroraeosrose,bmajdak|php-gtk,php-gtk-doc
 
 # The PHP-GTK Documentation Group has access to the PHP-GTK
 # documentation.

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

40 matches

Mail list logo