date:20050825

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

2005-08-25 Thread changelog

changelog   Fri Aug 26 01:36:42 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2084r2=1.2085ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2084 php-src/ChangeLog:1.2085
--- php-src/ChangeLog:1.2084Thu Aug 25 01:42:45 2005
+++ php-src/ChangeLog   Fri Aug 26 01:36:36 2005
@@ -1,3 +1,48 @@
+2005-08-25  Marcus Boerger  [EMAIL PROTECTED]
+
+* (PHP_5_1)
+  ext/ming/config.m4:
+  - MFH Fixed bug #34257 (lib64 not handled correctly in ming extension).
+
+* ext/ming/config.m4:
+  - Bugfix #34257 lib64 not handled correctly in ming extension
+
+2005-08-25  Zeev Suraski  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  configure.in
+  main/php_version.h:
+  Revert to -dev
+
+* (PHP_5_0)
+  ZendEngine2/zend.h:
+  Bump version
+
+* (PHP_5_0)
+  NEWS
+  configure.in
+  main/php_version.h:
+  Roll RC2
+
+2005-08-25  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ZendEngine2/zend.c:
+  Fixed memory leaks
+
+2005-08-25  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/curl/streams.c:
+  MFB
+
+* (PHP_5_1)
+  ext/curl/streams.c:
+  Fix crash with e.g. stream_get_meta_data()
+
+2005-08-25  Dmitry Stogov  [EMAIL PROTECTED]
+
+* ZendEngine2/zend.c:
+  Fixed access to uninitialized variables
+
 2005-08-24  Andrei Zmievski  [EMAIL PROTECTED]
 
 * unicode-todo.txt:
@@ -10648,7 +10693,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2084 2005/08/25 05:42:45 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2085 2005/08/26 05:36:36 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -14049,7 +14094,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2084 2005/08/25 05:42:45 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2085 2005/08/26 05:36:36 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -14530,7 +14575,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2084 2005/08/25 05:42:45 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2085 2005/08/26 05:36:36 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -16004,7 +16049,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2084 2005/08/25 05:42:45 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2085 2005/08/26 05:36:36 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

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

2005-08-25 Thread changelog

changelog   Fri Aug 26 01:36:55 2005 EDT

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.760r2=1.761ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.760 ZendEngine2/ChangeLog:1.761
--- ZendEngine2/ChangeLog:1.760 Thu Aug 25 01:43:45 2005
+++ ZendEngine2/ChangeLog   Fri Aug 26 01:36:54 2005
@@ -1,3 +1,17 @@
+2005-08-25  Zeev Suraski  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  zend.h:
+  Bump version
+
+2005-08-25  Dmitry Stogov  [EMAIL PROTECTED]
+
+* zend.c:
+  Fixed memory leaks
+
+* zend.c:
+  Fixed access to uninitialized variables
+
 2005-08-24  Andrei Zmievski  [EMAIL PROTECTED]
 
 * zend_compile.c
@@ -9973,7 +9987,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.760 2005/08/25 05:43:45 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.761 2005/08/26 05:36:54 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -11697,7 +11711,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.760 2005/08/25 05:43:45 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.761 2005/08/26 05:36:54 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

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

2005-08-25 Thread Dmitry Stogov

dmitry  Thu Aug 25 02:50:19 2005 EDT

  Modified files:  
/php-src/ext/soap   php_encoding.c 
  Log:
  ZTS fix
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.105r2=1.106ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.105 
php-src/ext/soap/php_encoding.c:1.106
--- php-src/ext/soap/php_encoding.c:1.105   Wed Aug 24 07:46:25 2005
+++ php-src/ext/soap/php_encoding.c Thu Aug 25 02:50:16 2005
@@ -17,7 +17,7 @@
   |  Dmitry Stogov [EMAIL PROTECTED] |
   +--+
 */
-/* $Id: php_encoding.c,v 1.105 2005/08/24 11:46:25 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.106 2005/08/25 06:50:16 dmitry Exp $ */
 
 #include time.h
 
@@ -1162,10 +1162,11 @@
xmlNodePtr trav;
sdlPtr sdl;
sdlTypePtr sdlType = type-sdl_type;
-   zend_class_entry *ce = ZEND_STANDARD_CLASS_DEF_PTR;
+   zend_class_entry *ce;
zend_bool redo_any = 0;
TSRMLS_FETCH();
 
+   ce = ZEND_STANDARD_CLASS_DEF_PTR;
if (SOAP_GLOBAL(class_map)  type-type_str) {
zval **classname;
zend_class_entry  *tmp;

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

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

2005-08-25 Thread Sara Golemon

pollita Thu Aug 25 04:59:26 2005 EDT

  Modified files:  
/php-src/ext/unicodeunicode_filter.c 
  Log:
  sizeof(char) != sizeof(UChar)  Don't tell ucnv_toUnicode it has more space 
than it really does
  
http://cvs.php.net/diff.php/php-src/ext/unicode/unicode_filter.c?r1=1.2r2=1.3ty=u
Index: php-src/ext/unicode/unicode_filter.c
diff -u php-src/ext/unicode/unicode_filter.c:1.2 
php-src/ext/unicode/unicode_filter.c:1.3
--- php-src/ext/unicode/unicode_filter.c:1.2Fri Aug 12 05:10:04 2005
+++ php-src/ext/unicode/unicode_filter.cThu Aug 25 04:59:24 2005
@@ -14,7 +14,7 @@
+--+
 */
 
-/* $Id: unicode_filter.c,v 1.2 2005/08/12 09:10:04 sniper Exp $ */
+/* $Id: unicode_filter.c,v 1.3 2005/08/25 08:59:24 pollita Exp $ */
 
 
 #include php.h
@@ -144,7 +144,7 @@
 
destp = destbuf = (UChar *)pemalloc(destlen, 
data-is_persistent);
 
-   ucnv_toUnicode(data-conv, destp, destbuf + destlen, 
(const char**)src, src + remaining, NULL, FALSE, errCode);
+   ucnv_toUnicode(data-conv, destp, 
(UChar*)((char*)destbuf + destlen), (const char**)src, src + remaining, NULL, 
FALSE, errCode);
 
new_bucket = php_stream_bucket_new_unicode(stream, 
destbuf, destp - destbuf, 1, data-is_persistent TSRMLS_CC);
php_stream_bucket_append(buckets_out, new_bucket 
TSRMLS_CC);

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

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re /ext/date/tests bug34087.phpt

2005-08-25 Thread Derick Rethans

derick  Thu Aug 25 05:46:33 2005 EDT

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
/php-src/ext/date/tests bug34087.phpt 
  Log:
  - Fixed bug #34087 for real.
  
  http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.31r2=1.32ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.31 
php-src/ext/date/lib/parse_date.c:1.32
--- php-src/ext/date/lib/parse_date.c:1.31  Wed Aug 24 09:47:26 2005
+++ php-src/ext/date/lib/parse_date.c   Thu Aug 25 05:46:26 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Aug 24 15:27:50 2005 */
+/* Generated by re2c 0.9.10.dev on Thu Aug 25 11:40:22 2005 */
 #line 1 resource/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.31 2005/08/24 13:47:26 derick Exp $ */
+/* $Id: parse_date.c,v 1.32 2005/08/25 09:46:26 derick Exp $ */
 
 #include timelib.h
 
@@ -773,7 +773,7 @@
 std:
s-tok = cursor;
s-len = 0;
-#line 878 resource/parse_date.re
+#line 879 resource/parse_date.re
 
 
 {
@@ -890,14 +890,14 @@
if(yych = 'Z') goto yy48;
goto yy3;
} else {
-   if(yych == 'e') goto yy1308;
+   if(yych == 'e') goto yy1312;
if(yych = 'z') goto yy48;
goto yy3;
}
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1360 resource/parse_date.re
+#line 1361 resource/parse_date.re
 {
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -931,7 +931,7 @@
if(yych = 'i') goto yy605;
goto yy48;
} else {
-   if(yych = 'o') goto yy1305;
+   if(yych = 'o') goto yy1309;
if(yych = 'z') goto yy48;
goto yy3;
}
@@ -979,21 +979,21 @@
case 'H':   case 'h':   goto yy470;
case 'U':   case 'u':   goto yy471;
case 'W':   case 'w':   goto yy472;
-   case 'o':   goto yy1293;
+   case 'o':   goto yy1297;
default:goto yy3;
}
 yy6:
YYDEBUG(6, *YYCURSOR);
yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
-   if(yych == '-') goto yy1289;
+   if(yych == '-') goto yy1293;
if(yych = '0') goto yy7;
-   if(yych = '9') goto yy1290;
+   if(yych = '9') goto yy1294;
goto yy7;
 yy7:
YYDEBUG(7, *YYCURSOR);
 
-#line 1426 resource/parse_date.re
+#line 1427 resource/parse_date.re
 {
 /* printf(unexpected character: #%d, %c , *s-tok, *s-tok); */
s-errors++;
@@ -1031,9 +1031,9 @@
case 'o':   case 's':
case 't':   case 'w':   case 'y':   goto yy776;
case '-':   goto yy783;
-   case '.':   goto yy1255;
+   case '.':   goto yy1259;
case '/':   goto yy782;
-   case '0':   goto yy1288;
+   case '0':   goto yy1292;
case '1':
case '2':
case '3':
@@ -1042,8 +1042,8 @@
case '6':
case '7':
case '8':
-   case '9':   goto yy1287;
-   case ':':   goto yy1256;
+   case '9':   goto yy1291;
+   case ':':   goto yy1260;
default:goto yy7;
}
 yy9:
@@ -1081,14 +1081,14 @@
case '/':   goto yy782;
case '0':
case '1':
-   case '2':   goto yy1287;
+   case '2':   goto yy1291;
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
-   case '9':   goto yy1254;
+   case '9':   goto yy1258;
case ':':   goto yy795;
default:goto yy7;
}
@@ -1128,13 +1128,13 @@
case '0':
case '1':
case '2':
-   case '3':   goto yy1254;
+   case '3':   goto yy1258;
case '4':
case '5':
case '6':
case '7':
case '8':
-   case '9':   goto yy1246;
+   case '9':   goto yy1250;
case ':':   goto yy795;
default:goto yy7;
}
@@ -1172,7 +1172,7 @@
case '.':   goto yy786;
case '/':   goto yy782;
case '0':
-   case '1':   goto yy1246;
+   case '1':   goto yy1250;
case '2':
case '3':
case '4':
@@ -1922,7 +1922,7 @@
 yy44:
YYDEBUG(44, *YYCURSOR);
 
-#line 1415 resource/parse_date.re
+#line 1416 resource/parse_date.re
 {
goto std;
}
@@ -1934,7 +1934,7 @@
 yy46:
YYDEBUG(46, *YYCURSOR);
 
-#line 1420 resource/parse_date.re
+#line 1421 resource/parse_date.re
 {

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date php_date.c php_date.h /ext/date/lib parse_date.c timelib.h /ext/date/lib/resource parse_date.re /ext/date/tests bug34087.phpt

2005-08-25 Thread Derick Rethans

derick  Thu Aug 25 05:47:29 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/date   php_date.c php_date.h 
/php-src/ext/date/lib   parse_date.c timelib.h 
/php-src/ext/date/lib/resource  parse_date.re 
/php-src/ext/date/tests bug34087.phpt 
  Log:
  - MFH: Fixed bug #34087 for real.
  - MFH: Windows compile fixes.
  
  http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.1r2=1.43.2.2ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.1 
php-src/ext/date/php_date.c:1.43.2.2
--- php-src/ext/date/php_date.c:1.43.2.1Tue Aug  9 17:10:21 2005
+++ php-src/ext/date/php_date.c Thu Aug 25 05:47:25 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_date.c,v 1.43.2.1 2005/08/09 21:10:21 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.2 2005/08/25 09:47:25 derick Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -328,7 +328,7 @@
Sun, Mon, Tue, Wed, Thu, Fri, Sat
 };
 
-static char *english_suffix(int number)
+static char *english_suffix(timelib_sll number)
 {
if (number = 10  number = 19) {
return th;
@@ -471,7 +471,7 @@
 {
char *format;
int   format_len;
-   long  ts = time(NULL);
+   time_t  ts = time(NULL);
char   *string;
 
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l, format, 
format_len, ts) == FAILURE) {
@@ -484,7 +484,7 @@
 }
 /* }}} */
 
-PHPAPI char *php_format_date(char *format, int format_len, long ts, int 
localtime TSRMLS_DC) /* {{{ */
+PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int 
localtime TSRMLS_DC) /* {{{ */
 {
timelib_time   *t;
timelib_tzinfo *tzi;
http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.17r2=1.17.2.1ty=u
Index: php-src/ext/date/php_date.h
diff -u php-src/ext/date/php_date.h:1.17 php-src/ext/date/php_date.h:1.17.2.1
--- php-src/ext/date/php_date.h:1.17Wed Aug  3 10:06:45 2005
+++ php-src/ext/date/php_date.h Thu Aug 25 05:47:25 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_date.h,v 1.17 2005/08/03 14:06:45 sniper Exp $ */
+/* $Id: php_date.h,v 1.17.2.1 2005/08/25 09:47:25 derick Exp $ */
 
 #ifndef PHP_DATE_H
 #define PHP_DATE_H
@@ -87,6 +87,6 @@
 #define _php_strftime php_strftime
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
 #endif
-PHPAPI char *php_format_date(char *format, int format_len, long ts, int 
localtime TSRMLS_DC);
+PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int 
localtime TSRMLS_DC);
 
 #endif /* PHP_DATE_H */
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.29.2.2r2=1.29.2.3ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.29.2.2 
php-src/ext/date/lib/parse_date.c:1.29.2.3
--- php-src/ext/date/lib/parse_date.c:1.29.2.2  Wed Aug 24 09:39:30 2005
+++ php-src/ext/date/lib/parse_date.c   Thu Aug 25 05:47:26 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Aug 24 15:27:23 2005 */
+/* Generated by re2c 0.9.10.dev on Thu Aug 25 11:33:54 2005 */
 #line 1 resource/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.29.2.2 2005/08/24 13:39:30 derick Exp $ */
+/* $Id: parse_date.c,v 1.29.2.3 2005/08/25 09:47:26 derick Exp $ */
 
 #include timelib.h
 
@@ -773,7 +773,7 @@
 std:
s-tok = cursor;
s-len = 0;
-#line 878 resource/parse_date.re
+#line 879 resource/parse_date.re
 
 
 {
@@ -890,14 +890,14 @@
if(yych = 'Z') goto yy48;
goto yy3;
} else {
-   if(yych == 'e') goto yy1308;
+   if(yych == 'e') goto yy1312;
if(yych = 'z') goto yy48;
goto yy3;
}
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1360 resource/parse_date.re
+#line 1361 resource/parse_date.re
 {
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -931,7 +931,7 @@
if(yych = 'i') goto yy605;
goto yy48;
} else {
-   if(yych = 'o') goto yy1305;
+   if(yych = 'o') goto yy1309;
if(yych = 'z') goto yy48;
goto yy3;
}
@@ -979,21 +979,21 @@
case 'H':   case 'h':   goto yy470;
case 'U':   case 'u':   goto yy471;
case 'W':   case 'w':   goto yy472;
-   case 'o':   goto yy1293;
+   case 'o':   goto yy1297;
default:goto yy3;
}
 yy6:
YYDEBUG(6, *YYCURSOR);
yyaccept = 0;
yych

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/curl streams.c

2005-08-25 Thread Jani Taskinen

sniper  Thu Aug 25 08:25:11 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/curl   streams.c 
  Log:
  Fix crash with e.g. stream_get_meta_data()
  
http://cvs.php.net/diff.php/php-src/ext/curl/streams.c?r1=1.14r2=1.14.2.1ty=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14 php-src/ext/curl/streams.c:1.14.2.1
--- php-src/ext/curl/streams.c:1.14 Wed Aug  3 10:06:45 2005
+++ php-src/ext/curl/streams.c  Thu Aug 25 08:25:10 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14 2005/08/03 14:06:45 sniper Exp $ */
+/* $Id: streams.c,v 1.14.2.1 2005/08/25 12:25:10 sniper Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -361,7 +361,7 @@
NULL, /* stream_stat: curl streams know how to stat themselves */
NULL, /* stat url */
NULL, /* opendir */
-   NULL, /* label */
+   cURL, /* label */
NULL, /* unlink */
NULL, /* rename */
NULL, /* mkdir */

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

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

2005-08-25 Thread Jani Taskinen

sniper  Thu Aug 25 08:26:12 2005 EDT

  Modified files:  
/php-src/ext/curl   streams.c 
  Log:
  MFB
  
http://cvs.php.net/diff.php/php-src/ext/curl/streams.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14 php-src/ext/curl/streams.c:1.15
--- php-src/ext/curl/streams.c:1.14 Wed Aug  3 10:06:45 2005
+++ php-src/ext/curl/streams.c  Thu Aug 25 08:26:12 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: streams.c,v 1.14 2005/08/03 14:06:45 sniper Exp $ */
+/* $Id: streams.c,v 1.15 2005/08/25 12:26:12 sniper Exp $ */
 
 /* This file implements cURL based wrappers.
  * NOTE: If you are implementing your own streams that are intended to
@@ -361,7 +361,7 @@
NULL, /* stream_stat: curl streams know how to stat themselves */
NULL, /* stat url */
NULL, /* opendir */
-   NULL, /* label */
+   cURL, /* label */
NULL, /* unlink */
NULL, /* rename */
NULL, /* mkdir */

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

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

2005-08-25 Thread Dmitry Stogov

dmitry  Thu Aug 25 09:53:39 2005 EDT

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  Fixed memory leaks
  
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.33r2=1.34ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.33 php-src/ext/libxml/libxml.c:1.34
--- php-src/ext/libxml/libxml.c:1.33Thu Aug 18 03:16:52 2005
+++ php-src/ext/libxml/libxml.c Thu Aug 25 09:53:38 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.33 2005/08/18 07:16:52 dmitry Exp $ */
+/* $Id: libxml.c,v 1.34 2005/08/25 13:53:38 dmitry Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -798,11 +798,14 @@
export_hnd.export_func = export_function;
 
if (zend_hash_add(php_libxml_exports, ce-name, ce-name_length + 1, 
export_hnd, sizeof(export_hnd), NULL) == SUCCESS) {
+   int ret;
UChar *uname;
 
uname = malloc(UBYTES(ce-name_length+1));
u_charsToUChars(ce-name, uname, ce-name_length+1);
-return zend_u_hash_add(php_libxml_exports, IS_UNICODE, uname, 
ce-name_length + 1, export_hnd, sizeof(export_hnd), NULL);
+ret = zend_u_hash_add(php_libxml_exports, IS_UNICODE, uname, 
ce-name_length + 1, export_hnd, sizeof(export_hnd), NULL);
+free(uname);
+return ret;
   }
   return FAILURE;
 }

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

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

2005-08-25 Thread Zeev Suraski

zeevThu Aug 25 13:10:24 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS configure.in 
/php-src/main   php_version.h 
  Log:
  Roll RC2
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.467r2=1.1760.2.468ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.467 php-src/NEWS:1.1760.2.468
--- php-src/NEWS:1.1760.2.467   Sun Aug 21 19:01:23 2005
+++ php-src/NEWSThu Aug 25 13:10:23 2005
@@ -1,6 +1,6 @@
 PHPNEWS
 |||
-21 Aug 2005, PHP 5.0.5RC1
+25 Aug 2005, PHP 5.0.5RC2
 - Upgraded PCRE library to version 5.0. (Andrei)
 - Removed php_check_syntax() function which never worked properly. (Ilia)
 - Added new function mysqli_set_charset(). (Georg)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.55r2=1.514.2.56ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.55 php-src/configure.in:1.514.2.56
--- php-src/configure.in:1.514.2.55 Wed Jul 27 07:44:08 2005
+++ php-src/configure.inThu Aug 25 13:10:23 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.55 2005/07/27 11:44:08 hyanantha Exp $ -*- 
sh -*-
+dnl ## $Id: configure.in,v 1.514.2.56 2005/08/25 17:10:23 zeev Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=5
-EXTRA_VERSION=-dev
+EXTRA_VERSION=RC2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.23r2=1.97.2.24ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.23 
php-src/main/php_version.h:1.97.2.24
--- php-src/main/php_version.h:1.97.2.23Wed Mar 30 17:24:52 2005
+++ php-src/main/php_version.h  Thu Aug 25 13:10:24 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION -dev
-#define PHP_VERSION 5.0.5-dev
+#define PHP_EXTRA_VERSION RC2
+#define PHP_VERSION 5.0.5RC2

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

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

2005-08-25 Thread Zeev Suraski

zeevThu Aug 25 14:29:15 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcconfigure.in 
/php-src/main   php_version.h 
  Log:
  Revert to -dev
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.56r2=1.514.2.57ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.56 php-src/configure.in:1.514.2.57
--- php-src/configure.in:1.514.2.56 Thu Aug 25 13:10:23 2005
+++ php-src/configure.inThu Aug 25 14:29:14 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.56 2005/08/25 17:10:23 zeev Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.514.2.57 2005/08/25 18:29:14 zeev Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -41,7 +41,7 @@
 MAJOR_VERSION=5
 MINOR_VERSION=0
 RELEASE_VERSION=5
-EXTRA_VERSION=RC2
+EXTRA_VERSION=-dev
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.97.2.24r2=1.97.2.25ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.97.2.24 
php-src/main/php_version.h:1.97.2.25
--- php-src/main/php_version.h:1.97.2.24Thu Aug 25 13:10:24 2005
+++ php-src/main/php_version.h  Thu Aug 25 14:29:15 2005
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
 #define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION RC2
-#define PHP_VERSION 5.0.5RC2
+#define PHP_EXTRA_VERSION -dev
+#define PHP_VERSION 5.0.5-dev

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/pcre config.w32

2005-08-25 Thread Edin Kadribasic

edink   Thu Aug 25 14:36:45 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/pcre   config.w32 
  Log:
  MFH: pcrelib update
  
http://cvs.php.net/diff.php/php-src/ext/pcre/config.w32?r1=1.3.2.1r2=1.3.2.2ty=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.3.2.1 php-src/ext/pcre/config.w32:1.3.2.2
--- php-src/ext/pcre/config.w32:1.3.2.1 Sat May 28 02:38:48 2005
+++ php-src/ext/pcre/config.w32 Thu Aug 25 14:36:45 2005
@@ -1,12 +1,12 @@
-// $Id: config.w32,v 1.3.2.1 2005/05/28 06:38:48 sebastian Exp $
+// $Id: config.w32,v 1.3.2.2 2005/08/25 18:36:45 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH(pcre-regex, Perl Compatible Regular Expressions, yes);
 
 if (PHP_PCRE_REGEX == yes) {
EXTENSION(pcre, php_pcre.c, PHP_PCRE_REGEX_SHARED,
-   -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000 -Iext/pcre/pcrelib 
-DNO_RECURSE);
-   ADD_SOURCES(ext/pcre/pcrelib, maketables.c get.c study.c pcre.c, 
pcre);
+   -DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP 
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=1000 
-Iext/pcre/pcrelib -DNO_RECURSE);
+   ADD_SOURCES(ext/pcre/pcrelib, pcre_chartables.c pcre_compile.c 
pcre_config.c pcre_dfa_exec.c pcre_exec.c pcre_fullinfo.c pcre_get.c 
pcre_globals.c pcre_info.c pcre_maketables.c pcre_ord2utf8.c pcre_printint.c 
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c 
pcre_ucp_findchar.c pcre_valid_utf8.c pcre_version.c pcre_xclass.c, pcre);
 
AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library');

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

[PHP-CVS] cvs: php-src /ext/ming config.m4

2005-08-25 Thread Marcus Boerger

helly   Thu Aug 25 16:49:49 2005 EDT

  Modified files:  
/php-src/ext/ming   config.m4 
  Log:
  - Bugfix #34257 lib64 not handled correctly in ming extension
  
http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22r2=1.23ty=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23
--- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005
+++ php-src/ext/ming/config.m4  Thu Aug 25 16:49:48 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $
+dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $
 dnl
 
 PHP_ARG_WITH(ming, for MING support,
@@ -9,7 +9,7 @@
   AC_CHECK_LIB(m, sin)
 
   for i in $PHP_MING /usr/local /usr; do
-if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f 
$i/lib/libming.a; then
   MING_DIR=$i
   break
 fi
@@ -34,11 +34,11 @@
   ],[
 AC_MSG_ERROR([Ming library 0.2a or greater required.])
   ],[
--L$MING_DIR/lib
+-L$MING_DIR/$PHP_LIBDIR
   ])
   
   PHP_ADD_INCLUDE($MING_INC_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
 
   AC_MSG_CHECKING([for destroySWFBlock])
   AC_TRY_RUN([

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

Re: [PHP-CVS] cvs: php-src /ext/ming config.m4

2005-08-25 Thread Marcus Boerger

Hello RMs,

  should this be MFHed to 5.0.5 and 5.1.0 ?

marcus

Thursday, August 25, 2005, 10:49:49 PM, you wrote:

 helly   Thu Aug 25 16:49:49 2005 EDT

   Modified files:  
 /php-src/ext/ming   config.m4 
   Log:
   - Bugfix #34257 lib64 not handled correctly in ming extension
  
 http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22r2=1.23ty=u
 Index: php-src/ext/ming/config.m4
 diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23
 --- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005
 +++ php-src/ext/ming/config.m4  Thu Aug 25 16:49:48 2005
 @@ -1,5 +1,5 @@
  dnl
 -dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $
 +dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $
  dnl
 
  PHP_ARG_WITH(ming, for MING support,
 @@ -9,7 +9,7 @@
AC_CHECK_LIB(m, sin)
 
for i in $PHP_MING /usr/local /usr; do
 -if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
 +if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f 
 $i/lib/libming.a; then
MING_DIR=$i
break
  fi
 @@ -34,11 +34,11 @@
],[
  AC_MSG_ERROR([Ming library 0.2a or greater required.])
],[
 --L$MING_DIR/lib
 +-L$MING_DIR/$PHP_LIBDIR
])
   
PHP_ADD_INCLUDE($MING_INC_DIR)
 -  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 +  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
 
AC_MSG_CHECKING([for destroySWFBlock])
AC_TRY_RUN([




Best regards,
 Marcus

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

Re: [PHP-CVS] cvs: php-src /ext/ming config.m4

2005-08-25 Thread Andi Gutmans


Yes, I think it can be safely MFH'ed. Thanks.

At 01:52 PM 8/25/2005, Marcus Boerger wrote:

Hello RMs,

  should this be MFHed to 5.0.5 and 5.1.0 ?

marcus

Thursday, August 25, 2005, 10:49:49 PM, you wrote:

 helly   Thu Aug 25 16:49:49 2005 EDT

   Modified files:
 /php-src/ext/ming   config.m4
   Log:
   - Bugfix #34257 lib64 not handled correctly in ming extension

 http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22r2=1.23ty=u
 Index: php-src/ext/ming/config.m4
 diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23
 --- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005
 +++ php-src/ext/ming/config.m4  Thu Aug 25 16:49:48 2005
 @@ -1,5 +1,5 @@
  dnl
 -dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $
 +dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $
  dnl

  PHP_ARG_WITH(ming, for MING support,
 @@ -9,7 +9,7 @@
AC_CHECK_LIB(m, sin)

for i in $PHP_MING /usr/local /usr; do
 -if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f 
$i/lib/libming.a; then
 +if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f 
$i/lib/libming.a; then

MING_DIR=$i
break
  fi
 @@ -34,11 +34,11 @@
],[
  AC_MSG_ERROR([Ming library 0.2a or greater required.])
],[
 --L$MING_DIR/lib
 +-L$MING_DIR/$PHP_LIBDIR
])

PHP_ADD_INCLUDE($MING_INC_DIR)
 -  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
 +  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, 
MING_SHARED_LIBADD)


AC_MSG_CHECKING([for destroySWFBlock])
AC_TRY_RUN([




Best regards,
 Marcus


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

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

2005-08-25 Thread Marcus Boerger

helly   Thu Aug 25 18:02:29 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/ming   config.m4 
  Log:
  - MFH Fixed bug #34257 (lib64 not handled correctly in ming extension).
  
http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22r2=1.22.2.1ty=u
Index: php-src/ext/ming/config.m4
diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.22.2.1
--- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005
+++ php-src/ext/ming/config.m4  Thu Aug 25 18:02:28 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $
+dnl $Id: config.m4,v 1.22.2.1 2005/08/25 22:02:28 helly Exp $
 dnl
 
 PHP_ARG_WITH(ming, for MING support,
@@ -9,7 +9,7 @@
   AC_CHECK_LIB(m, sin)
 
   for i in $PHP_MING /usr/local /usr; do
-if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f 
$i/lib/libming.a; then
   MING_DIR=$i
   break
 fi
@@ -34,11 +34,11 @@
   ],[
 AC_MSG_ERROR([Ming library 0.2a or greater required.])
   ],[
--L$MING_DIR/lib
+-L$MING_DIR/$PHP_LIBDIR
   ])
   
   PHP_ADD_INCLUDE($MING_INC_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
 
   AC_MSG_CHECKING([for destroySWFBlock])
   AC_TRY_RUN([

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

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

2005-08-25 Thread Marcus Boerger

helly   Thu Aug 25 18:06:58 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
  Log:
  _ MFH
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.23r2=1.2027.2.24ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.23 php-src/NEWS:1.2027.2.24
--- php-src/NEWS:1.2027.2.23Wed Aug 24 10:48:57 2005
+++ php-src/NEWSThu Aug 25 18:06:52 2005
@@ -13,6 +13,7 @@
 - Fixed make test to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34257 (lib64 not handled correctly in ming extension). (Marcus)
 - Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (Ilia)
 - Fixed bug #34156 (memory usage remains elevated after memory limit is 
   reached). (Ilia)

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

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

2005-08-25 Thread Andi Gutmans


How are we doing with this? Is it a new bug in 5.0.5 and 5.1.0?

At 12:06 PM 8/24/2005, Xuefer wrote:

this patch produce bug: http://bugs.php.net/bug.php?id=34240

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


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

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

2005-08-25 Thread Rob Richards

rrichards   Thu Aug 25 22:29:34 2005 EDT

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  Fix URI escaping
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.34r2=1.35ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.34 php-src/ext/libxml/libxml.c:1.35
--- php-src/ext/libxml/libxml.c:1.34Thu Aug 25 09:53:38 2005
+++ php-src/ext/libxml/libxml.c Thu Aug 25 22:29:32 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.34 2005/08/25 13:53:38 dmitry Exp $ */
+/* $Id: libxml.c,v 1.35 2005/08/26 02:29:32 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -253,14 +253,26 @@
 int php_libxml_streams_IO_match_wrapper(const char *filename)
 {
char *resolved_path;
-   int retval;
+   int retval, isescaped=0;
+   xmlURI *uri;
 
TSRMLS_FETCH();
 
if (zend_is_executing(TSRMLS_C)) {
-   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   uri = xmlParseURI((xmlChar *)filename);
+   if (uri  (uri-scheme == NULL || (xmlStrncmp(uri-scheme, 
file, 4) == 0))) {
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   isescaped = 1;
+   } else {
+   resolved_path = (char *)filename;
+   }
+
+   if (uri) {
+   xmlFreeURI(uri);
+   }
+
retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0 
TSRMLS_CC) ? 1 : 0;
-   if (resolved_path) {
+   if (resolved_path  isescaped) {
xmlFree(resolved_path);
}
return retval;
@@ -275,9 +287,22 @@
php_stream_wrapper *wrapper = NULL;
char *resolved_path, *path_to_open = NULL;
void *ret_val = NULL;
+   int isescaped=0;
+   xmlURI *uri;
 
TSRMLS_FETCH();
-   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+
+   uri = xmlParseURI((xmlChar *)filename);
+   if (uri  (uri-scheme == NULL || (xmlStrncmp(uri-scheme, file, 4) 
== 0))) {
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   isescaped = 1;
+   } else {
+   resolved_path = (char *)filename;
+   }
+
+   if (uri) {
+   xmlFreeURI(uri);
+   }
 
if (resolved_path == NULL) {
return NULL;
@@ -292,7 +317,9 @@
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open, 
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper  read_only  wrapper-wops-url_stat) {
if (wrapper-wops-url_stat(wrapper, path_to_open, 
PHP_STREAM_URL_STAT_QUIET, ssbuf, NULL TSRMLS_CC) == -1) {
-   xmlFree(resolved_path);
+   if (isescaped) {
+   xmlFree(resolved_path);
+   }
return NULL;
}
}
@@ -302,7 +329,9 @@
}
 
ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
-   xmlFree(resolved_path);
+   if (isescaped) {
+   xmlFree(resolved_path);
+   }
return ret_val;
 }
 


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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/libxml libxml.c

2005-08-25 Thread Rob Richards

rrichards   Thu Aug 25 22:29:56 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/libxml libxml.c 
  Log:
  MFH: Fix URI escaping
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.32r2=1.32.2.1ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32 php-src/ext/libxml/libxml.c:1.32.2.1
--- php-src/ext/libxml/libxml.c:1.32Wed Aug  3 10:07:23 2005
+++ php-src/ext/libxml/libxml.c Thu Aug 25 22:29:56 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32 2005/08/03 14:07:23 sniper Exp $ */
+/* $Id: libxml.c,v 1.32.2.1 2005/08/26 02:29:56 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -253,14 +253,26 @@
 int php_libxml_streams_IO_match_wrapper(const char *filename)
 {
char *resolved_path;
-   int retval;
+   int retval, isescaped=0;
+   xmlURI *uri;
 
TSRMLS_FETCH();
 
if (zend_is_executing(TSRMLS_C)) {
-   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   uri = xmlParseURI((xmlChar *)filename);
+   if (uri  (uri-scheme == NULL || (xmlStrncmp(uri-scheme, 
file, 4) == 0))) {
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   isescaped = 1;
+   } else {
+   resolved_path = (char *)filename;
+   }
+
+   if (uri) {
+   xmlFreeURI(uri);
+   }
+
retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0 
TSRMLS_CC) ? 1 : 0;
-   if (resolved_path) {
+   if (resolved_path  isescaped) {
xmlFree(resolved_path);
}
return retval;
@@ -275,9 +287,22 @@
php_stream_wrapper *wrapper = NULL;
char *resolved_path, *path_to_open = NULL;
void *ret_val = NULL;
+   int isescaped=0;
+   xmlURI *uri;
 
TSRMLS_FETCH();
-   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+
+   uri = xmlParseURI((xmlChar *)filename);
+   if (uri  (uri-scheme == NULL || (xmlStrncmp(uri-scheme, file, 4) 
== 0))) {
+   resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+   isescaped = 1;
+   } else {
+   resolved_path = (char *)filename;
+   }
+
+   if (uri) {
+   xmlFreeURI(uri);
+   }
 
if (resolved_path == NULL) {
return NULL;
@@ -292,7 +317,9 @@
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open, 
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper  read_only  wrapper-wops-url_stat) {
if (wrapper-wops-url_stat(wrapper, path_to_open, 
PHP_STREAM_URL_STAT_QUIET, ssbuf, NULL TSRMLS_CC) == -1) {
-   xmlFree(resolved_path);
+   if (isescaped) {
+   xmlFree(resolved_path);
+   }
return NULL;
}
}
@@ -302,7 +329,9 @@
}
 
ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, 
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
-   xmlFree(resolved_path);
+   if (isescaped) {
+   xmlFree(resolved_path);
+   }
return ret_val;
 }
 

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

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

2005-08-25 Thread Ilia Alshanetsky

iliaa   Thu Aug 25 23:32:35 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/standard   base64.c 
  Log:
  Fixed bug #34214 (base64_decode() does not properly ignore whitespace)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/base64.c?r1=1.43r2=1.43.2.1ty=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.43 
php-src/ext/standard/base64.c:1.43.2.1
--- php-src/ext/standard/base64.c:1.43  Wed Aug  3 10:07:56 2005
+++ php-src/ext/standard/base64.c   Thu Aug 25 23:32:31 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: base64.c,v 1.43 2005/08/03 14:07:56 sniper Exp $ */
+/* $Id: base64.c,v 1.43.2.1 2005/08/26 03:32:31 iliaa Exp $ */
 
 #include string.h
 
@@ -153,15 +153,6 @@
while ((ch = *current++) != '\0'  length--  0) {
if (ch == base64_pad) break;
 
-   /* When Base64 gets POSTed, all pluses are interpreted as spaces.
-  This line changes them back.  It's not exactly the Base64 
spec,
-  but it is completely compatible with it (the spec says that
-  spaces are invalid).  This will also save many people 
considerable
-  headache.  - Turadg Aleahmad [EMAIL PROTECTED]
-   */
-
-   if (ch == ' ') ch = '+'; 
-
ch = base64_reverse_table[ch];
if (ch  0) continue;
 

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

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

2005-08-25 Thread Ilia Alshanetsky

iliaa   Thu Aug 25 23:32:53 2005 EDT

  Modified files:  
/php-src/ext/standard   base64.c 
  Log:
  MFH: Fixed bug #34214 (base64_decode() does not properly ignore whitespace)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/base64.c?r1=1.43r2=1.44ty=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.43 php-src/ext/standard/base64.c:1.44
--- php-src/ext/standard/base64.c:1.43  Wed Aug  3 10:07:56 2005
+++ php-src/ext/standard/base64.c   Thu Aug 25 23:32:53 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: base64.c,v 1.43 2005/08/03 14:07:56 sniper Exp $ */
+/* $Id: base64.c,v 1.44 2005/08/26 03:32:53 iliaa Exp $ */
 
 #include string.h
 
@@ -153,15 +153,6 @@
while ((ch = *current++) != '\0'  length--  0) {
if (ch == base64_pad) break;
 
-   /* When Base64 gets POSTed, all pluses are interpreted as spaces.
-  This line changes them back.  It's not exactly the Base64 
spec,
-  but it is completely compatible with it (the spec says that
-  spaces are invalid).  This will also save many people 
considerable
-  headache.  - Turadg Aleahmad [EMAIL PROTECTED]
-   */
-
-   if (ch == ' ') ch = '+'; 
-
ch = base64_reverse_table[ch];
if (ch  0) continue;
 

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

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

2005-08-25 Thread Ilia Alshanetsky

iliaa   Thu Aug 25 23:33:08 2005 EDT

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/standard   base64.c 
  Log:
  MFH: Fixed bug #34214 (base64_decode() does not properly ignore whitespace)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/base64.c?r1=1.33.4.6r2=1.33.4.6.4.1ty=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.33.4.6 
php-src/ext/standard/base64.c:1.33.4.6.4.1
--- php-src/ext/standard/base64.c:1.33.4.6  Sat Mar  6 14:06:12 2004
+++ php-src/ext/standard/base64.c   Thu Aug 25 23:33:07 2005
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED]  
|
+--+
  */
-/* $Id: base64.c,v 1.33.4.6 2004/03/06 19:06:12 iliaa Exp $ */
+/* $Id: base64.c,v 1.33.4.6.4.1 2005/08/26 03:33:07 iliaa Exp $ */
 
 #include string.h
 
@@ -153,15 +153,6 @@
while ((ch = *current++) != '\0'  length--  0) {
if (ch == base64_pad) break;
 
-   /* When Base64 gets POSTed, all pluses are interpreted as spaces.
-  This line changes them back.  It's not exactly the Base64 
spec,
-  but it is completely compatible with it (the spec says that
-  spaces are invalid).  This will also save many people 
considerable
-  headache.  - Turadg Aleahmad [EMAIL PROTECTED]
-   */
-
-   if (ch == ' ') ch = '+'; 
-
ch = base64_reverse_table[ch];
if (ch  0) continue;
 

-- 
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-DAILY] cvs: ZendEngine2 / ChangeLog

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

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

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re /ext/date/tests bug34087.phpt

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date php_date.c php_date.h /ext/date/lib parse_date.c timelib.h /ext/date/lib/resource parse_date.re /ext/date/tests bug34087.phpt

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/curl streams.c

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

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/pcre config.w32

[PHP-CVS] cvs: php-src /ext/ming config.m4

Re: [PHP-CVS] cvs: php-src /ext/ming config.m4

Re: [PHP-CVS] cvs: php-src /ext/ming config.m4

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

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_1) /ext/libxml libxml.c

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

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

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

23 matches

Site Navigation

Mail list logo

Footer information