date:20090129

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

2009-01-29 Thread changelog

changelog   Fri Jan 30 01:36:37 2009 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3303r2=1.3304diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3303 php-src/ChangeLog:1.3304
--- php-src/ChangeLog:1.3303Thu Jan 29 01:42:23 2009
+++ php-src/ChangeLog   Fri Jan 30 01:36:34 2009
@@ -1,3 +1,28 @@
+2009-01-29  Scott MacVicar  sc...@macvicar.net
+
+* ext/mbstring/mbstring.c
+  ext/mbstring/mbstring.c:
+  MFB Fix bug #47245 - Double free in mb_detect_encoding()
+
+* (PHP_5_2)
+  ext/mbstring/mbstring.c:
+  Fix bug #47245 - Double free in mb_detect_encoding()
+
+2009-01-29  Stanislav Malyshev  s...@zend.com
+
+* (PHP_5_3)
+  ext/intl/intl_data.h:
+  fix // comments
+
+2009-01-29  Felipe Pena  felipe...@gmail.com
+
+* ext/enchant/enchant.c:
+  - Added arginfo
+
+* (PHP_5_3)
+  ext/enchant/enchant.c:
+  - Re-added safe mode check
+
 2009-01-28  Scott MacVicar  sc...@macvicar.net
 
 * (PHP_5_3)
@@ -28957,7 +28982,7 @@
 
 * sapi/litespeed/lsapi_main.c
   sapi/litespeed/lsapilib.c:
-  - Added missing $Id: ChangeLog,v 1.3303 2009/01/29 01:42:23 changelog 
Exp $ tags and nuked c++ comments
+  - Added missing $Id: ChangeLog,v 1.3304 2009/01/30 01:36:34 changelog 
Exp $ tags and nuked c++ comments
 
 * (PHP_5_3)
   ext/intl/locale/locale.c

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.

2009-01-29 Thread John Mertic

jmertic Thu Jan 29 18:30:33 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs 
  Log:
  Applied fixed contributed from Ruslan Yakushev rusl...@microsoft.com:
  
  - The parameters passed to custom action for creating the scripts should be 
in quotes.
  - The VBScript code to get the short path to the fastcgi executable was 
failing on XP unless a separate file object was created.
  http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.36r2=1.37diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.36 
win-installer/PHPInstallerBase52.wxs:1.37
--- win-installer/PHPInstallerBase52.wxs:1.36   Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jan 29 18:30:32 2009
@@ -638,7 +638,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGICmd
   Property=fcgiconfigJSFastCGI
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 CustomAction Id=fcgiconfigJSFastCGI 
   BinaryKey=WixCA
   DllEntry=CAQuietExec 
@@ -647,7 +647,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequestsCmd
   Property=fcgiconfigJSFastCGISetInstanceMaxRequests
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -656,7 +656,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd
   Property=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,PHPRC:quot;[INSTALLDIR]quot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:1,PHPRC:quot;[INSTALLDIR]quot; /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -665,7 +665,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGIremoveCmd
   Property=fcgiconfigJSFastCGIremove
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-remove -section:quot;PHPquot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -remove 
-section:quot;PHPquot; /
 CustomAction Id=fcgiconfigJSFastCGIremove 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.12r2=1.13diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.12 
win-installer/PHPInstallerBase52NTS.wxs:1.13
--- win-installer/PHPInstallerBase52NTS.wxs:1.12Tue Jan 27 14:28:19 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jan 29 18:30:33 2009
@@ -507,7 +507,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGICmd
   Property=fcgiconfigJSFastCGI
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-add -section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -add 
-section:quot;PHPquot; -extension:php 
-path:quot;[INSTALLDIR]php-cgi.exequot; /
 CustomAction Id=fcgiconfigJSFastCGI 
   BinaryKey=WixCA
   DllEntry=CAQuietExec 
@@ -516,7 +516,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequestsCmd
   Property=fcgiconfigJSFastCGISetInstanceMaxRequests
-  Value=cscript quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; 
-set -section:quot;PHPquot; -InstanceMaxRequests:1 /
+  Value=quot;cscriptquot; 
quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set 
-section:quot;PHPquot; -InstanceMaxRequests:1 /
 CustomAction Id=fcgiconfigJSFastCGISetInstanceMaxRequests 
   BinaryKey=WixCA 
   DllEntry=CAQuietExec 
@@ -525,7 +525,7 @@
   Impersonate=no /
 CustomAction Id=fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTSCmd

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2009-01-29 Thread John Mertic

jmertic Thu Jan 29 19:03:30 2009 UTC

  Modified files:  
/win-installer  PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Add Binary tag for the wixca.dll file.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.37r2=1.38diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.37 
win-installer/PHPInstallerBase52.wxs:1.38
--- win-installer/PHPInstallerBase52.wxs:1.37   Thu Jan 29 18:30:32 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jan 29 19:03:27 2009
@@ -547,7 +547,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.13 
win-installer/PHPInstallerBase52NTS.wxs:1.14
--- win-installer/PHPInstallerBase52NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jan 29 19:03:28 2009
@@ -443,7 +443,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.13 
win-installer/PHPInstallerBase53.wxs:1.14
--- win-installer/PHPInstallerBase53.wxs:1.13   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.12r2=1.13diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.12 
win-installer/PHPInstallerBase53NTS.wxs:1.13
--- win-installer/PHPInstallerBase53NTS.wxs:1.12Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI 
/+quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]quot; /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.27r2=1.28diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.27 
win-installer/PHPInstallerBase60.wxs:1.28
--- win-installer/PHPInstallerBase60.wxs:1.27   Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60.wxsThu Jan 29 19:03:29 2009
@@ -518,7 +518,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts60.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=netserveCGIInterpretersaddCmd
   Property=netserveCGIInterpretersadd
   Value=quot;[%ProgramFiles]NetServe Web Server\config.exe /add 
CGIInterpreters php^|[INSTALLDIR]php-cgi.exe'] /
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.13r2=1.14diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.13 
win-installer/PHPInstallerBase60NTS.wxs:1.14
--- win-installer/PHPInstallerBase60NTS.wxs:1.13Thu Jan 29 18:30:33 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Jan 29 19:03:29 2009
@@ -412,7 +412,8 @@
 /Feature
 
 Binary Id=PHPInstallerScripts SourceFile=PHPInstallerScripts52.vbs / 
-
+Binary Id=WixCA src=Wix\wixca.dll/
+
 CustomAction Id=iis700FastCGIaddCmd
   Property=iis700FastCGIadd
   Value=quot;[WindowsFolder]system32\inetsrv\APPCMD.EXEquot; SET CONFIG 
-section:system.webServer/fastCGI

[PHP-CVS] cvs: CVSROOT / avail

2009-01-29 Thread Johannes Schlüter

johannesThu Jan 29 20:38:19 2009 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  karma to pecl/proctitle for magicaltux
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1492r2=1.1493diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1492 CVSROOT/avail:1.1493
--- CVSROOT/avail:1.1492Sun Jan 25 12:21:18 2009
+++ CVSROOT/avail   Thu Jan 29 20:38:17 2009
@@ -300,7 +300,7 @@
 avail|mabouzou|pecl/sqlanywhere
 avail|jawed|pecl/oauth
 avail|sean|pecl/parsekit
-avail|magicaltux|php-src/ext/wddx
+avail|magicaltux|pecl/proctitle,php-src/ext/wddx
 avail|mikesul|pecl/ssh2
 avail|rjcarroll|pecl/fuse
 avail|ab|pecl/gender



-- 
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/intl intl_data.h

2009-01-29 Thread Stanislav Malyshev

stasThu Jan 29 21:49:51 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/intl   intl_data.h 
  Log:
  fix // comments
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_data.h?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/intl_data.h
diff -u php-src/ext/intl/intl_data.h:1.1.2.3 
php-src/ext/intl/intl_data.h:1.1.2.4
--- php-src/ext/intl/intl_data.h:1.1.2.3Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/intl_data.hThu Jan 29 21:49:49 2009
@@ -45,7 +45,7 @@
obj = (oclass##_object *) zend_object_store_get_object( object 
TSRMLS_CC ); \
 intl_error_reset( INTL_DATA_ERROR_P(obj) TSRMLS_CC );  
\
 
-// Check status by error code, if error - exit
+/* Check status by error code, if error - exit */
 #define INTL_CHECK_STATUS(err, msg)
\
 intl_error_set_code( NULL, (err) TSRMLS_CC );  
\
 if( U_FAILURE((err)) ) 
\
@@ -54,7 +54,7 @@
 RETURN_FALSE;  
\
 }
 
-// Check status in object, if error - exit
+/* Check status in object, if error - exit */
 #define INTL_METHOD_CHECK_STATUS(obj, msg) 
\
 intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) TSRMLS_CC );
\
 if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) 
\
@@ -63,7 +63,7 @@
 RETURN_FALSE;  
\
 }
 
-// Check status, if error - destroy value and exit
+/* Check status, if error - destroy value and exit */
 #define INTL_CTOR_CHECK_STATUS(obj, msg)   
\
 intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) TSRMLS_CC );
\
 if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) 
\



-- 
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/mbstring mbstring.c

2009-01-29 Thread Scott MacVicar

scottmacThu Jan 29 22:58:53 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   mbstring.c 
  Log:
  Fix bug #47245 - Double free in mb_detect_encoding()
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.42r2=1.224.2.22.2.43diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.42 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.43
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.42 Wed Dec 31 11:17:39 2008
+++ php-src/ext/mbstring/mbstring.c Thu Jan 29 22:58:52 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.42 2008/12/31 11:17:39 sebastian Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.43 2009/01/29 22:58:52 scottmac Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -2666,6 +2666,7 @@
if (!php_mb_parse_encoding_array(*arg_list, list, 
size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 0;
}
}
@@ -2675,6 +2676,7 @@
if (!php_mb_parse_encoding_list(Z_STRVAL_PP(arg_list), 
Z_STRLEN_PP(arg_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 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/mbstring mbstring.c

2009-01-29 Thread Scott MacVicar

scottmacThu Jan 29 22:59:58 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB Fix bug #47245 - Double free in mb_detect_encoding()
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.44r2=1.224.2.22.2.25.2.45diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.44 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.45
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.44Mon Jan  5 
09:14:58 2009
+++ php-src/ext/mbstring/mbstring.c Thu Jan 29 22:59:57 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.44 2009/01/05 09:14:58 tony2001 Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.45 2009/01/29 22:59:57 scottmac Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -3187,6 +3187,7 @@
if (!php_mb_parse_encoding_array(encoding_list, list, 
size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 0;
}
}
@@ -3196,6 +3197,7 @@
if 
(!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), 
Z_STRLEN_P(encoding_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 0;
}
}



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

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

2009-01-29 Thread Scott MacVicar

scottmacThu Jan 29 23:01:49 2009 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  MFB Fix bug #47245 - Double free in mb_detect_encoding()
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.311r2=1.312diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.311 
php-src/ext/mbstring/mbstring.c:1.312
--- php-src/ext/mbstring/mbstring.c:1.311   Mon Jan  5 09:16:38 2009
+++ php-src/ext/mbstring/mbstring.c Thu Jan 29 23:01:40 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.311 2009/01/05 09:16:38 tony2001 Exp $ */
+/* $Id: mbstring.c,v 1.312 2009/01/29 23:01:40 scottmac Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -3018,6 +3018,7 @@
if (!php_mb_parse_encoding_array(encoding_list, list, 
size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 0;
}
}
@@ -3027,6 +3028,7 @@
if 
(!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), 
Z_STRLEN_P(encoding_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);
+   list = NULL;
size = 0;
}
}



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

[PHP-CVS] cvs: php-src /ext/enchant enchant.c php_enchant.h

2009-01-29 Thread Felipe Pena

felipe  Fri Jan 30 00:16:13 2009 UTC

  Modified files:  
/php-src/ext/enchantenchant.c php_enchant.h 
  Log:
  - Year++
  
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.20 php-src/ext/enchant/enchant.c:1.21
--- php-src/ext/enchant/enchant.c:1.20  Thu Jan 29 00:36:25 2009
+++ php-src/ext/enchant/enchant.c   Fri Jan 30 00:16:12 2009
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2004 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.0 of the PHP license,   |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   | Ilia Alshanetsky i...@prohost.org  |
   +--+
 
-  $Id: enchant.c,v 1.20 2009/01/29 00:36:25 felipe Exp $
+  $Id: enchant.c,v 1.21 2009/01/30 00:16:12 felipe Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -309,7 +309,7 @@
php_info_print_table_start();
php_info_print_table_header(2, enchant support, enabled);
php_info_print_table_row(2, Version, PHP_ENCHANT_VERSION);
-   php_info_print_table_row(2, Revision, $Revision: 1.20 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.21 $);
php_info_print_table_end();
 
php_info_print_table_start();
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/php_enchant.h?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/enchant/php_enchant.h
diff -u php-src/ext/enchant/php_enchant.h:1.4 
php-src/ext/enchant/php_enchant.h:1.5
--- php-src/ext/enchant/php_enchant.h:1.4   Mon Mar 31 09:35:55 2008
+++ php-src/ext/enchant/php_enchant.h   Fri Jan 30 00:16:12 2009
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 4|
   +--+
-  | Copyright (c) 1997-2003 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.0 of the PHP license,   |
   | that is bundled with this package in the file LICENSE, and is|
@@ -15,7 +15,7 @@
   | Author: Pierre-Alain Joye p...@pearfr.org   |
   +--+
 
-  $Id: php_enchant.h,v 1.4 2008/03/31 09:35:55 sfox Exp $
+  $Id: php_enchant.h,v 1.5 2009/01/30 00:16:12 felipe Exp $
 */
 
 #ifndef PHP_ENCHANT_H



-- 
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 string.c

2009-01-29 Thread Ilia Alshanetsky

iliaa   Fri Jan 30 00:16:28 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard   string.c 
  Log:
  
  Improved validation checks inside str_pad()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.40r2=1.445.2.14.2.69.2.41diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.40 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.41
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.40  Wed Dec 31 11:15:46 2008
+++ php-src/ext/standard/string.c   Fri Jan 30 00:16:27 2009
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.40 2008/12/31 11:15:46 sebastian Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.41 2009/01/30 00:16:27 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4816,7 +4816,7 @@
 
/* If resulting string turns out to be shorter than input string,
   we simply copy the input and return. */
-   if (pad_length  0 || num_pad_chars  0) {
+   if (pad_length = 0 || num_pad_chars = 0) {
RETURN_STRINGL(input, input_len, 1);
}
 



-- 
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/enchant enchant.c php_enchant.h

2009-01-29 Thread Felipe Pena

felipe  Fri Jan 30 00:16:32 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/enchantenchant.c php_enchant.h 
  Log:
  - MFH: Year++
  
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.19.2.2r2=1.19.2.3diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.19.2.2 
php-src/ext/enchant/enchant.c:1.19.2.3
--- php-src/ext/enchant/enchant.c:1.19.2.2  Thu Jan 29 00:37:16 2009
+++ php-src/ext/enchant/enchant.c   Fri Jan 30 00:16:32 2009
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 5|
   +--+
-  | Copyright (c) 1997-2004 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.0 of the PHP license,   |
   | that is bundled with this package in the file LICENSE, and is|
@@ -16,7 +16,7 @@
   | Ilia Alshanetsky i...@prohost.org  |
   +--+
 
-  $Id: enchant.c,v 1.19.2.2 2009/01/29 00:37:16 felipe Exp $
+  $Id: enchant.c,v 1.19.2.3 2009/01/30 00:16:32 felipe Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -309,7 +309,7 @@
php_info_print_table_start();
php_info_print_table_header(2, enchant support, enabled);
php_info_print_table_row(2, Version, PHP_ENCHANT_VERSION);
-   php_info_print_table_row(2, Revision, $Revision: 1.19.2.2 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.19.2.3 $);
php_info_print_table_end();
 
php_info_print_table_start();
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/php_enchant.h?r1=1.4r2=1.4.2.1diff_format=u
Index: php-src/ext/enchant/php_enchant.h
diff -u php-src/ext/enchant/php_enchant.h:1.4 
php-src/ext/enchant/php_enchant.h:1.4.2.1
--- php-src/ext/enchant/php_enchant.h:1.4   Mon Mar 31 09:35:55 2008
+++ php-src/ext/enchant/php_enchant.h   Fri Jan 30 00:16:32 2009
@@ -2,7 +2,7 @@
   +--+
   | PHP Version 4|
   +--+
-  | Copyright (c) 1997-2003 The PHP Group|
+  | Copyright (c) 1997-2009 The PHP Group|
   +--+
   | This source file is subject to version 3.0 of the PHP license,   |
   | that is bundled with this package in the file LICENSE, and is|
@@ -15,7 +15,7 @@
   | Author: Pierre-Alain Joye p...@pearfr.org   |
   +--+
 
-  $Id: php_enchant.h,v 1.4 2008/03/31 09:35:55 sfox Exp $
+  $Id: php_enchant.h,v 1.4.2.1 2009/01/30 00:16:32 felipe Exp $
 */
 
 #ifndef PHP_ENCHANT_H



-- 
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 string.c

2009-01-29 Thread Ilia Alshanetsky

iliaa   Fri Jan 30 00:17:06 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   string.c 
  Log:
  
  MFB: Improved validation checks inside str_pad()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.79r2=1.445.2.14.2.80diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.79 
php-src/ext/standard/string.c:1.445.2.14.2.80
--- php-src/ext/standard/string.c:1.445.2.14.2.79   Wed Dec 31 11:17:45 2008
+++ php-src/ext/standard/string.c   Fri Jan 30 00:17:05 2009
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.79 2008/12/31 11:17:45 sebastian Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.80 2009/01/30 00:17:05 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -4922,7 +4922,7 @@
 
/* If resulting string turns out to be shorter than input string,
   we simply copy the input and return. */
-   if (Z_LVAL_PP(pad_length)  0 || num_pad_chars  0) {
+   if (Z_LVAL_PP(pad_length) = 0 || num_pad_chars = 0) {
RETURN_ZVAL(*input, 1, 0);
}
 



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

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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstallerScripts52.

[PHP-CVS] cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

[PHP-CVS] cvs: CVSROOT / avail

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl intl_data.h

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

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

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

[PHP-CVS] cvs: php-src /ext/enchant enchant.c php_enchant.h

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

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

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

12 matches

Site Navigation

Mail list logo

Footer information