date:20060923

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

2006-09-23 Thread changelog

changelog   Sun Sep 24 01:31:00 2006 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2462r2=1.2463diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2462 php-src/ChangeLog:1.2463
--- php-src/ChangeLog:1.2462Sat Sep 23 01:30:50 2006
+++ php-src/ChangeLog   Sun Sep 24 01:30:59 2006
@@ -1,3 +1,27 @@
+2006-09-23  Antony Dovgal  [EMAIL PROTECTED]
+
+* ext/standard/dir.c:
+  add missing parameter to opendir() and fix segfault
+
+* sapi/cgi/cgi_main.c
+  sapi/cgi/cgi_main.c:
+  fix CGI build
+
+* ext/standard/string.c:
+  one more try to fix ZTS build
+
+* ext/standard/string.c:
+  fix ZTS build
+
+* ext/standard/url.c:
+  fix possible segfault in #38891
+
+2006-09-23  Rui Hirokawa  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/mbstring/config.m4:
+  fixed build problem of some extensions which depend on ext/mbstring.
+
 2006-09-22  Sara Golemon  [EMAIL PROTECTED]
 
 * ext/standard/file.c:

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

2006-09-23 Thread Rui Hirokawa

hirokawaSat Sep 23 10:55:59 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   config.m4 
  Log:
  fixed build problem of some extensions which depend on ext/mbstring.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.4r2=1.58.2.4.2.5diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.4 
php-src/ext/mbstring/config.m4:1.58.2.4.2.5
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.4 Thu Sep 21 16:37:20 2006
+++ php-src/ext/mbstring/config.m4  Sat Sep 23 10:55:58 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.4 2006/09/21 16:37:20 masugata Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.5 2006/09/23 10:55:58 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -302,7 +302,7 @@
   dnl libmbfl is required
   PHP_MBSTRING_SETUP_LIBMBFL
   PHP_MBSTRING_EXTENSION
-  PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/config.h 
libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h 
libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h 
libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h 
libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h* 
libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h 
libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h 
libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h ])
+  PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h 
libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h 
libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h 
libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h 
libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h 
libmbfl/mbfl/mbfl_defs.h* libmbfl/mbfl/mbfl_encoding.h 
libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h 
libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h 
libmbfl/mbfl/mbfl_string.h oniguruma/oniguruma.h oniguruma/php_onig_compat.h])
 fi
 
 # vim600: sts=2 sw=2 et

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

2006-09-23 Thread Antony Dovgal

tony2001Sat Sep 23 11:58:58 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   url.c 
  Log:
  MFH: fix possible segfault in #38891
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.2r2=1.86.2.5.2.3diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5.2.2 
php-src/ext/standard/url.c:1.86.2.5.2.3
--- php-src/ext/standard/url.c:1.86.2.5.2.2 Thu Jun 29 14:31:56 2006
+++ php-src/ext/standard/url.c  Sat Sep 23 11:58:58 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: url.c,v 1.86.2.5.2.2 2006/06/29 14:31:56 bjori Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.3 2006/09/23 11:58:58 tony2001 Exp $ */
 
 #include stdlib.h
 #include string.h
@@ -678,6 +678,10 @@
 
zend_hash_internal_pointer_reset_ex(HASH_OF(stream-wrapperdata), pos);
while (zend_hash_get_current_data_ex(HASH_OF(stream-wrapperdata), 
(void**)hdr, pos) != FAILURE) {
+   if (!hdr || Z_TYPE_PP(hdr) != IS_STRING) {
+   zend_hash_move_forward_ex(HASH_OF(stream-wrapperdata), 
pos);
+   continue;
+   }
if (!format) {
 no_name_header:
add_next_index_stringl(return_value, Z_STRVAL_PP(hdr), 
Z_STRLEN_PP(hdr), 1);

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

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

2006-09-23 Thread Antony Dovgal

tony2001Sat Sep 23 12:22:07 2006 UTC

  Modified files:  
/php-src/ext/standard   string.c 
  Log:
  one more try to fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.592r2=1.593diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.592 php-src/ext/standard/string.c:1.593
--- php-src/ext/standard/string.c:1.592 Sat Sep 23 12:17:43 2006
+++ php-src/ext/standard/string.c   Sat Sep 23 12:22:07 2006
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.592 2006/09/23 12:17:43 tony2001 Exp $ */
+/* $Id: string.c,v 1.593 2006/09/23 12:22:07 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -3418,7 +3418,7 @@
UChar cp;
zend_uchar type;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_DC, t, old, 
old_len, type) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t, old, 
old_len, type) == FAILURE) {
return;
}
 
@@ -5546,7 +5546,7 @@
}
 
if (UG(unicode)) {
-   php_error_docref(NULL TSRMLS_DC, E_STRICT, deprecated in 
Unicode mode, please use ICU locale functions);
+   php_error_docref(NULL TSRMLS_CC, E_STRICT, deprecated in 
Unicode mode, please use ICU locale functions);
}
 
 #ifdef HAVE_SETLOCALE
@@ -6358,7 +6358,7 @@
RETURN_FALSE;
}
if (UG(unicode)  mode != 1) {
-   php_error_docref(NULL TSRMLS_DC, E_WARNING, Only 
mode=1 is supported with Unicode strings);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Only 
mode=1 is supported with Unicode strings);
}
}
 
@@ -6483,7 +6483,7 @@
}
 
if (UG(unicode)) {
-   php_error_docref(NULL TSRMLS_DC, E_STRICT, deprecated in 
Unicode mode, please use ICU locale functions);
+   php_error_docref(NULL TSRMLS_CC, E_STRICT, deprecated in 
Unicode mode, please use ICU locale functions);
}
 
MAKE_STD_ZVAL(grouping);

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

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

2006-09-23 Thread Antony Dovgal

tony2001Sat Sep 23 12:27:35 2006 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
  Log:
  fix CGI build
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.299r2=1.300diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.299 php-src/sapi/cgi/cgi_main.c:1.300
--- php-src/sapi/cgi/cgi_main.c:1.299   Fri Sep 22 17:42:08 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Sep 23 12:27:35 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.299 2006/09/22 17:42:08 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.300 2006/09/23 12:27:35 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1033,19 +1033,19 @@
if ((val = strchr(php_optarg, '='))) {
val++;
if (!isalnum(*val)  *val != ''  
*val != '\''  *val != '\0') {
-   cli_sapi_module.ini_entries = 
realloc(cli_sapi_module.ini_entries, ini_entries_len + len + 
sizeof(\\\n\0));
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - 
php_optarg));
+   cgi_sapi_module.ini_entries = 
realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + 
sizeof(\\\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - 
php_optarg));
ini_entries_len += (val - 
php_optarg);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, \, 1);
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, \, 1);
ini_entries_len++;
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, val, len - (val - 
php_optarg));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, val, len - (val - 
php_optarg));
ini_entries_len += len - (val - 
php_optarg);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, \\n\0, 
sizeof(\\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, \\n\0, 
sizeof(\\n\0));
ini_entries_len += 
sizeof(\n\0\) - 2;
} else {
-   cli_sapi_module.ini_entries = 
realloc(cli_sapi_module.ini_entries, ini_entries_len + len + sizeof(\n\0));
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len + len, \n\0, 
sizeof(\n\0));
+   cgi_sapi_module.ini_entries = 
realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof(\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, \n\0, 
sizeof(\n\0));
ini_entries_len += len + 
sizeof(\n\0) - 2;
}
} 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_2) /sapi/cgi cgi_main.c

2006-09-23 Thread Antony Dovgal

tony2001Sat Sep 23 12:27:41 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/sapi/cgi   cgi_main.c 
  Log:
  fix CGI build
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.12r2=1.267.2.15.2.13diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.12 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.13
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.12 Fri Sep 22 17:41:09 2006
+++ php-src/sapi/cgi/cgi_main.c Sat Sep 23 12:27:40 2006
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.12 2006/09/22 17:41:09 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.13 2006/09/23 12:27:40 tony2001 Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -1070,19 +1070,19 @@
if ((val = strchr(php_optarg, '='))) {
val++;
if (!isalnum(*val)  *val != ''  
*val != '\''  *val != '\0') {
-   cli_sapi_module.ini_entries = 
realloc(cli_sapi_module.ini_entries, ini_entries_len + len + 
sizeof(\\\n\0));
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - 
php_optarg));
+   cgi_sapi_module.ini_entries = 
realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + 
sizeof(\\\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - 
php_optarg));
ini_entries_len += (val - 
php_optarg);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, \, 1);
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, \, 1);
ini_entries_len++;
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, val, len - (val - 
php_optarg));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, val, len - (val - 
php_optarg));
ini_entries_len += len - (val - 
php_optarg);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, \\n\0, 
sizeof(\\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, \\n\0, 
sizeof(\\n\0));
ini_entries_len += 
sizeof(\n\0\) - 2;
} else {
-   cli_sapi_module.ini_entries = 
realloc(cli_sapi_module.ini_entries, ini_entries_len + len + sizeof(\n\0));
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
-   
memcpy(cli_sapi_module.ini_entries + ini_entries_len + len, \n\0, 
sizeof(\n\0));
+   cgi_sapi_module.ini_entries = 
realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof(\n\0));
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
+   
memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, \n\0, 
sizeof(\n\0));
ini_entries_len += len + 
sizeof(\n\0) - 2;
}
} else {

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

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

2006-09-23 Thread Antony Dovgal

tony2001Sat Sep 23 12:32:32 2006 UTC

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  add missing parameter to opendir() and fix segfault
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.154r2=1.155diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.154 php-src/ext/standard/dir.c:1.155
--- php-src/ext/standard/dir.c:1.154Fri Sep 22 23:57:38 2006
+++ php-src/ext/standard/dir.c  Sat Sep 23 12:32:32 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.154 2006/09/22 23:57:38 pollita Exp $ */
+/* $Id: dir.c,v 1.155 2006/09/23 12:32:32 tony2001 Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -186,7 +186,7 @@
php_stream_context *context = NULL;
php_stream *dirp;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t|r, dir, 
dir_len, zcontext) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t|r, dir, 
dir_len, dir_type, zcontext) == FAILURE) {
return;
}
 

-- 
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: php-src(PHP_5_2) /ext/mbstring config.m4

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

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

[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c

[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c

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

7 matches

Site Navigation

Mail list logo

Footer information