date:20050214

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

2005-02-14 Thread changelog

changelog   Mon Feb 14 20:34:48 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1894r2=1.1895ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1894 php-src/ChangeLog:1.1895
--- php-src/ChangeLog:1.1894Sun Feb 13 20:39:15 2005
+++ php-src/ChangeLog   Mon Feb 14 20:34:46 2005
@@ -1,3 +1,62 @@
+2005-02-14  Jani Taskinen  [EMAIL PROTECTED]
+
+* ext/sockets/sockets.c:
+  - More sock-error resets
+
+2005-02-14  Edin Kadribasic  [EMAIL PROTECTED]
+
+* ext/pgsql/pgsql.c:
+  ws fix
+
+* NEWS
+  ext/pgsql/pgsql.c
+  ext/pgsql/php_pgsql.h:
+  Added pg_field_type_oid() function
+
+* ext/pgsql/config.w32:
+  Added missing defines (#31751)
+
+2005-02-14  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_4_3)
+  ext/sockets/sockets.c:
+  Fix typo
+
+* (PHP_4_3)
+  ext/sockets/sockets.c:
+  MFH: - Removed duplicate error + reset error in new sockets
+
+* ext/sockets/sockets.c:
+  - Removed duplicate error + reset error in new sockets
+
+2005-02-14  Marcus Boerger  [EMAIL PROTECTED]
+
+* ext/standard/var_unserializer.c:
+  - Disallow illegal class names (.c part)
+
+* ext/standard/var_unserializer.re:
+  - Disallow illegal class names
+
+2005-02-14  Anantha Kesari H Y  [EMAIL PROTECTED]
+
+* main/php.h:
+  NetWare Libc has php.h so no need of having netware specific block here
+
+2005-02-14  Jani Taskinen  [EMAIL PROTECTED]
+
+* (PHP_5_0)
+  php.ini-dist
+  php.ini-recommended
+  ext/sockets/php_sockets.h:
+  MFH: nuke unused code + non-existing ini option
+
+* php.ini-dist
+  php.ini-recommended:
+  Nuke non-existing ini option
+
+* ext/sockets/php_sockets.h:
+  Nuke unused code
+
 2005-02-13  Marcus Boerger  [EMAIL PROTECTED]
 
 * ZendEngine2/zend_execute_API.c
@@ -15,7 +74,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.1894 2005/02/14 01:39:15 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.1895 2005/02/15 01:34:46 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -496,7 +555,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.1894 2005/02/14 01:39:15 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.1895 2005/02/15 01:34:46 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -1970,7 +2029,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.1894 2005/02/14 01:39:15 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.1895 2005/02/15 01:34:46 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:

[PHP-CVS] cvs: php-src /ext/sockets php_sockets.h

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 03:21:34 2005 EDT

  Modified files:  
/php-src/ext/socketsphp_sockets.h 
  Log:
  Nuke unused code
  
http://cvs.php.net/diff.php/php-src/ext/sockets/php_sockets.h?r1=1.34r2=1.35ty=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.34 
php-src/ext/sockets/php_sockets.h:1.35
--- php-src/ext/sockets/php_sockets.h:1.34  Thu Jan  8 12:32:48 2004
+++ php-src/ext/sockets/php_sockets.h   Mon Feb 14 03:21:34 2005
@@ -22,7 +22,7 @@
 #ifndef PHP_SOCKETS_H
 #define PHP_SOCKETS_H
 
-/* $Id: php_sockets.h,v 1.34 2004/01/08 17:32:48 sniper Exp $ */
+/* $Id: php_sockets.h,v 1.35 2005/02/14 08:21:34 sniper Exp $ */
 
 #if HAVE_SOCKETS
 
@@ -82,10 +82,6 @@
int error;
 } php_socket;
 
-typedef struct {
-   zend_bool   use_system_read;
-} php_sockets_globals;
-
 /* Prototypes */
 #ifdef ilia_0 /* not needed, only causes a compiler warning */
 static int php_open_listen_sock(php_socket **php_sock, int port, int backlog 
TSRMLS_DC);

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets php_sockets.h

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 03:23:20 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/socketsphp_sockets.h 
  Log:
  MFH: nuke unused code
  
http://cvs.php.net/diff.php/php-src/ext/sockets/php_sockets.h?r1=1.26.2.4r2=1.26.2.5ty=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.26.2.4 
php-src/ext/sockets/php_sockets.h:1.26.2.5
--- php-src/ext/sockets/php_sockets.h:1.26.2.4  Thu Jun  5 19:48:17 2003
+++ php-src/ext/sockets/php_sockets.h   Mon Feb 14 03:23:20 2005
@@ -22,7 +22,7 @@
 #ifndef PHP_SOCKETS_H
 #define PHP_SOCKETS_H
 
-/* $Id: php_sockets.h,v 1.26.2.4 2003/06/05 23:48:17 iliaa Exp $ */
+/* $Id: php_sockets.h,v 1.26.2.5 2005/02/14 08:23:20 sniper Exp $ */
 
 #if HAVE_SOCKETS
 
@@ -97,10 +97,6 @@
int error;
 } php_socket;
 
-typedef struct {
-   zend_bool   use_system_read;
-} php_sockets_globals;
-
 ZEND_BEGIN_MODULE_GLOBALS(sockets)
int last_error;
char *strerror_buf;

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

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 03:23:54 2005 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  Nuke non-existing ini option
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.222r2=1.223ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.222 php-src/php.ini-dist:1.223
--- php-src/php.ini-dist:1.222  Mon Dec 27 02:19:25 2004
+++ php-src/php.ini-distMon Feb 14 03:23:53 2005
@@ -1088,10 +1088,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.167r2=1.168ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.167 php-src/php.ini-recommended:1.168
--- php-src/php.ini-recommended:1.167   Mon Dec 27 22:48:18 2004
+++ php-src/php.ini-recommended Mon Feb 14 03:23:54 2005
@@ -1146,10 +1146,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file =

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

[PHP-CVS] cvs: php-src(PHP_4_3) / php.ini-dist php.ini-recommended

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 03:26:10 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  MFH: nuke non-existing ini option
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.171.2.25r2=1.171.2.26ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.171.2.25 php-src/php.ini-dist:1.171.2.26
--- php-src/php.ini-dist:1.171.2.25 Fri Dec 17 10:43:21 2004
+++ php-src/php.ini-distMon Feb 14 03:26:10 2005
@@ -1020,10 +1020,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file = 
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.119.2.22r2=1.119.2.23ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.119.2.22 
php-src/php.ini-recommended:1.119.2.23
--- php-src/php.ini-recommended:1.119.2.22  Wed Aug 18 01:05:23 2004
+++ php-src/php.ini-recommended Mon Feb 14 03:26:10 2005
@@ -1018,10 +1018,6 @@
 ; Default proxy password.
 ;pfpro.proxypassword =
 
-[Sockets]
-; Use the system read() function instead of the php_read() wrapper.
-sockets.use_system_read = On
-
 [com]
 ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
 ;com.typelib_file = 

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

[PHP-CVS] cvs: php-src /main php.h

2005-02-14 Thread Anantha Kesari H Y

hyanantha   Mon Feb 14 06:10:11 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  NetWare Libc has php.h so no need of having netware specific block here
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.211r2=1.212ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.211 php-src/main/php.h:1.212
--- php-src/main/php.h:1.211Fri Jan 14 15:44:28 2005
+++ php-src/main/php.h  Mon Feb 14 06:10:07 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.211 2005/01/14 20:44:28 sniper Exp $ */
+/* $Id: php.h,v 1.212 2005/02/14 11:10:07 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -201,9 +201,6 @@
 # ifdef PHP_WIN32
 #include win32/pwd.h
 #include win32/param.h
-#elif defined(NETWARE)
-#include sys/param.h
-#include NetWare/pwd.h
 # else
 #include pwd.h
 #include sys/param.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_0) /ext/standard var_unserializer.re

2005-02-14 Thread Marcus Boerger

helly   Mon Feb 14 16:00:37 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   var_unserializer.re 
  Log:
  - MFH
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.27.2.9r2=1.27.2.10ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.27.2.9 
php-src/ext/standard/var_unserializer.re:1.27.2.10
--- php-src/ext/standard/var_unserializer.re:1.27.2.9   Sun Jan 30 11:39:09 2005
+++ php-src/ext/standard/var_unserializer.reMon Feb 14 16:00:36 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.27.2.9 2005/01/30 16:39:09 iliaa Exp $ */
+/* $Id: var_unserializer.re,v 1.27.2.10 2005/02/14 21:00:36 helly Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -473,7 +473,7 @@
 }
 
 O: uiv : []   {
-   size_t len, len2, maxlen;
+   size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
@@ -506,6 +506,13 @@
return 0;
}
 
+   len3 = strspn(class_name, 
0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ);
+   if (len3 != len)
+   {
+   *p = YYCURSOR + len3 - len;
+   return 0;
+   }
+
class_name = estrndup(class_name, len);
 
do {

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

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

2005-02-14 Thread Marcus Boerger

helly   Mon Feb 14 16:03:12 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.c 
  Log:
  - Disallow illegal class names (.c part)
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.52r2=1.53ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.52 
php-src/ext/standard/var_unserializer.c:1.53
--- php-src/ext/standard/var_unserializer.c:1.52Sun Jan 30 11:38:53 2005
+++ php-src/ext/standard/var_unserializer.c Mon Feb 14 16:03:09 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.3 on Sun Jan 30 11:34:19 2005 */
-#line 1 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+/* Generated by re2c 0.9.4 on Mon Feb 14 21:57:21 2005 */
+#line 1 /usr/src/php-cvs/ext/standard/var_unserializer.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.52 2005/01/30 16:38:53 iliaa Exp $ */
+/* $Id: var_unserializer.c,v 1.53 2005/02/14 21:03:09 helly Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -147,7 +147,7 @@
 #define YYMARKER marker
 
 
-#line 154 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 154 /usr/src/php-cvs/ext/standard/var_unserializer.re
 
 
 
@@ -406,7 +406,7 @@
goto yy16;
} else {
if(yych = '}') goto yy14;
-   if(yych = '\277')  goto yy16;
+   if(yych = 0xBF)goto yy16;
goto yy2;
}
}
@@ -420,7 +420,7 @@
if(yych == ':') goto yy87;
goto yy4;
 yy4:
-#line 574 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 581 /usr/src/php-cvs/ext/standard/var_unserializer.re
 { return 0; }
 #line 102 stdout
 yy5:   yyaccept = 0;
@@ -461,7 +461,7 @@
 yy14:  ++YYCURSOR;
goto yy15;
 yy15:
-#line 568 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 575 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of 
serialized data);
@@ -490,9 +490,9 @@
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
-#line 475 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 475 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {
-   size_t len, len2, maxlen;
+   size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
@@ -525,6 +525,13 @@
return 0;
}
 
+   len3 = strspn(class_name, 
0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ);
+   if (len3 != len)
+   {
+   *p = YYCURSOR + len3 - len;
+   return 0;
+   }
+
class_name = estrndup(class_name, len);
 
do {
@@ -583,7 +590,7 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 264 stdout
+#line 271 stdout
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -612,7 +619,7 @@
 yy29:  ++YYCURSOR;
goto yy30;
 yy30:
-#line 467 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 467 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {
 
INIT_PZVAL(*rval);
@@ -620,7 +627,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 302 stdout
+#line 309 stdout
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -644,7 +651,7 @@
 yy36:  ++YYCURSOR;
goto yy37;
 yy37:
-#line 449 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 449 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {
int elements = parse_iv(start + 2);
 
@@ -662,7 +669,7 @@
 
return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 345 stdout
+#line 352 stdout
 yy38:  yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy2;
@@ -686,7 +693,7 @@
 yy43:  ++YYCURSOR;
goto yy44;
 yy44:
-#line 421 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 421 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {
size_t len, maxlen;
char *str;
@@ -714,7 +721,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
 }
-#line 398 stdout
+#line 405 stdout
 yy45:  yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -803,14 +810,14 @@
 yy55:  ++YYCURSOR;
goto yy56;
 yy56:
-#line 414 /home/rei/php_dev/php5.1/ext/standard/var_unserializer.re
+#line 414 /usr/src/php-cvs/ext/standard/var_unserializer.re
 {

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

2005-02-14 Thread Marcus Boerger

helly   Mon Feb 14 16:03:53 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   var_unserializer.c 
  Log:
  - MFH
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.10r2=1.38.2.11ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.10 
php-src/ext/standard/var_unserializer.c:1.38.2.11
--- php-src/ext/standard/var_unserializer.c:1.38.2.10   Sun Jan 30 11:39:08 2005
+++ php-src/ext/standard/var_unserializer.c Mon Feb 14 16:03:52 2005
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.9.3 on Sun Jan 30 11:27:32 2005 */
-#line 1 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+/* Generated by re2c 0.9.4 on Mon Feb 14 22:03:31 2005 */
+#line 1 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 /*
   +--+
   | PHP Version 5|
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.38.2.10 2005/01/30 16:39:08 iliaa Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.11 2005/02/14 21:03:52 helly Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -147,7 +147,7 @@
 #define YYMARKER marker
 
 
-#line 154 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 154 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 
 
 
@@ -406,7 +406,7 @@
goto yy16;
} else {
if(yych = '}') goto yy14;
-   if(yych = '\277')  goto yy16;
+   if(yych = 0xBF)goto yy16;
goto yy2;
}
}
@@ -420,7 +420,7 @@
if(yych == ':') goto yy87;
goto yy4;
 yy4:
-#line 574 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 581 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 { return 0; }
 #line 102 stdout
 yy5:   yyaccept = 0;
@@ -461,7 +461,7 @@
 yy14:  ++YYCURSOR;
goto yy15;
 yy15:
-#line 568 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 575 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, Unexpected end of 
serialized data);
@@ -490,9 +490,9 @@
 yy22:  ++YYCURSOR;
goto yy23;
 yy23:
-#line 475 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 475 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {
-   size_t len, len2, maxlen;
+   size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
@@ -525,6 +525,13 @@
return 0;
}
 
+   len3 = strspn(class_name, 
0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ);
+   if (len3 != len)
+   {
+   *p = YYCURSOR + len3 - len;
+   return 0;
+   }
+
class_name = estrndup(class_name, len);
 
do {
@@ -583,7 +590,7 @@
 
return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 264 stdout
+#line 271 stdout
 yy24:  yych = *++YYCURSOR;
if(yych = ','){
if(yych != '+') goto yy2;
@@ -612,7 +619,7 @@
 yy29:  ++YYCURSOR;
goto yy30;
 yy30:
-#line 467 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 467 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {
 
INIT_PZVAL(*rval);
@@ -620,7 +627,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, 
ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 302 stdout
+#line 309 stdout
 yy31:  yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych = '/') goto yy2;
@@ -644,7 +651,7 @@
 yy36:  ++YYCURSOR;
goto yy37;
 yy37:
-#line 449 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 449 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {
int elements = parse_iv(start + 2);
 
@@ -662,7 +669,7 @@
 
return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 345 stdout
+#line 352 stdout
 yy38:  yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych = '/') goto yy2;
@@ -686,7 +693,7 @@
 yy43:  ++YYCURSOR;
goto yy44;
 yy44:
-#line 421 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 421 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {
size_t len, maxlen;
char *str;
@@ -714,7 +721,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
 }
-#line 398 stdout
+#line 405 stdout
 yy45:  yych = *++YYCURSOR;
if(yych = '/'){
if(yych = ','){
@@ -803,14 +810,14 @@
 yy55:  ++YYCURSOR;
goto yy56;
 yy56:
-#line 414 /home/rei/php_dev/php5/ext/standard/var_unserializer.re
+#line 414 /usr/src/PHP_5_0/ext/standard/var_unserializer.re
 {

[PHP-CVS] cvs: php-src /ext/standard var_unserializer.re

2005-02-14 Thread Marcus Boerger

helly   Mon Feb 14 15:58:25 2005 EDT

  Modified files:  
/php-src/ext/standard   var_unserializer.re 
  Log:
  - Disallow illegal class names
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.40r2=1.41ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.40 
php-src/ext/standard/var_unserializer.re:1.41
--- php-src/ext/standard/var_unserializer.re:1.40   Sun Jan 30 11:38:53 2005
+++ php-src/ext/standard/var_unserializer.reMon Feb 14 15:58:22 2005
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.40 2005/01/30 16:38:53 iliaa Exp $ */
+/* $Id: var_unserializer.re,v 1.41 2005/02/14 20:58:22 helly Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -473,7 +473,7 @@
 }
 
 O: uiv : []   {
-   size_t len, len2, maxlen;
+   size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
@@ -506,6 +506,13 @@
return 0;
}
 
+   len3 = strspn(class_name, 
0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ);
+   if (len3 != len)
+   {
+   *p = YYCURSOR + len3 - len;
+   return 0;
+   }
+
class_name = estrndup(class_name, len);
 
do {

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 17:18:48 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/socketssockets.c 
  Log:
  Fix typo
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.26r2=1.125.2.27ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.26 
php-src/ext/sockets/sockets.c:1.125.2.27
--- php-src/ext/sockets/sockets.c:1.125.2.26Mon Feb 14 17:17:30 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 17:18:46 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.26 2005/02/14 22:17:30 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.27 2005/02/14 22:18:46 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -644,7 +644,7 @@
RETURN_FALSE;
}
 
-   sock-error = 0;
+   php_sock-error = 0;
 
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 17:17:31 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/socketssockets.c 
  Log:
  MFH: - Removed duplicate error + reset error in new sockets
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.25r2=1.125.2.26ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.25 
php-src/ext/sockets/sockets.c:1.125.2.26
--- php-src/ext/sockets/sockets.c:1.125.2.25Sat Feb 12 13:16:04 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 17:17:30 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.25 2005/02/12 18:16:04 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.26 2005/02/14 22:17:30 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -644,6 +644,8 @@
RETURN_FALSE;
}
 
+   sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -662,10 +664,10 @@
ZEND_FETCH_RESOURCE(php_sock, php_socket *, arg1, -1, le_socket_name, 
le_socket);

if (!php_accept_connect(php_sock, new_sock, (struct sockaddr *) sa 
TSRMLS_CC)) {
-   php_error(E_WARNING, %s() unable to accept socket connection 
[%d]: %s,
- get_active_function_name(TSRMLS_C), errno, 
php_strerror(errno TSRMLS_CC));
RETURN_FALSE;
}
+
+   new_sock-error = 0;

ZEND_REGISTER_RESOURCE(return_value, new_sock, le_socket);
 }

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

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

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 17:16:06 2005 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  - Removed duplicate error + reset error in new sockets
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.167r2=1.168ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.167 php-src/ext/sockets/sockets.c:1.168
--- php-src/ext/sockets/sockets.c:1.167 Sat Feb 12 13:14:03 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 17:16:06 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.167 2005/02/12 18:14:03 sniper Exp $ */
+/* $Id: sockets.c,v 1.168 2005/02/14 22:16:06 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -663,6 +663,8 @@
RETURN_FALSE;
}
 
+   php_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -681,9 +683,10 @@
ZEND_FETCH_RESOURCE(php_sock, php_socket *, arg1, -1, le_socket_name, 
le_socket);

if (!php_accept_connect(php_sock, new_sock, (struct sockaddr *) sa 
TSRMLS_CC)) {
-   PHP_SOCKET_ERROR(new_sock, unable to accept socket 
connection, errno);
RETURN_FALSE;
}
+
+   new_sock-error = 0;

ZEND_REGISTER_RESOURCE(return_value, new_sock, le_socket);
 }

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

[PHP-CVS] cvs: php-src /ext/pgsql config.w32

2005-02-14 Thread Edin Kadribasic

edink   Mon Feb 14 18:01:58 2005 EDT

  Modified files:  
/php-src/ext/pgsql  config.w32 
  Log:
  Added missing defines (#31751)
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/config.w32?r1=1.2r2=1.3ty=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.2 php-src/ext/pgsql/config.w32:1.3
--- php-src/ext/pgsql/config.w32:1.2Thu Dec  4 20:03:34 2003
+++ php-src/ext/pgsql/config.w32Mon Feb 14 18:01:57 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/05 01:03:34 edink Exp $
+// $Id: config.w32,v 1.3 2005/02/14 23:01:57 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL, 
PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
-   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PQCMDTUPLES /D 
HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS);
+   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS 
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D 
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}

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

2005-02-14 Thread Edin Kadribasic

edink   Mon Feb 14 18:04:21 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-srcNEWS 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.243r2=1.1760.2.244ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.243 php-src/NEWS:1.1760.2.244
--- php-src/NEWS:1.1760.2.243   Sat Feb 12 11:39:48 2005
+++ php-src/NEWSMon Feb 14 18:04:18 2005
@@ -27,6 +27,7 @@
   values). (Ilia)
 - Fixed bug #31755 (Cannot create SOAP header in no namespace). (Dmitry)
 - Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
+- Fixed bug #31751 (pg_parameter_status() missing on Windows). (Edin)
 - Fixed bug #31747 (SOAP Digest Authentication doesn't work with 
   HTTP/1.1 100 Continue response). (Dmitry)
 - Fixed bug #31732 (mb_get_info() causes segfault when no parameters 

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

[PHP-CVS] cvs: php-src / NEWS /ext/pgsql pgsql.c php_pgsql.h

2005-02-14 Thread Edin Kadribasic

edink   Mon Feb 14 18:36:16 2005 EDT

  Modified files:  
/php-srcNEWS 
/php-src/ext/pgsql  pgsql.c php_pgsql.h 
  Log:
  Added pg_field_type_oid() function
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1841r2=1.1842ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1841 php-src/NEWS:1.1842
--- php-src/NEWS:1.1841 Thu Feb 10 06:45:22 2005
+++ php-src/NEWSMon Feb 14 18:36:15 2005
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? ??? 2004, PHP 5.1.0
+- Added pg_field_type_oid() PostgreSQL function. (mauroi at digbang dot com)
 - Added zend_declare_property_...() and zend_update_property_...()
   API functions for bool, double and binary safe strings. (Hartmut)
 - Moved extensions to PECL:
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.312r2=1.313ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.312 php-src/ext/pgsql/pgsql.c:1.313
--- php-src/ext/pgsql/pgsql.c:1.312 Mon Jul 19 03:19:42 2004
+++ php-src/ext/pgsql/pgsql.c   Mon Feb 14 18:36:16 2005
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.312 2004/07/19 07:19:42 andi Exp $ */
+/* $Id: pgsql.c,v 1.313 2005/02/14 23:36:16 edink Exp $ */
 
 #include stdlib.h
 
@@ -117,6 +117,7 @@
PHP_FE(pg_field_num,NULL)
PHP_FE(pg_field_size,   NULL)
PHP_FE(pg_field_type,   NULL)
+   PHP_FE(pg_field_type_oid, NULL)
PHP_FE(pg_field_prtlen, NULL)
PHP_FE(pg_field_is_null,NULL)
/* async message function */
@@ -1251,6 +1252,7 @@
 #define PHP_PG_FIELD_NAME 1
 #define PHP_PG_FIELD_SIZE 2
 #define PHP_PG_FIELD_TYPE 3
+#define PHP_PG_FIELD_TYPE_OID 4
 
 /* {{{ php_pgsql_get_field_info
  */
@@ -1259,6 +1261,7 @@
zval **result, **field;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
+   Oid oid;

if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, result, 
field)==FAILURE) {
WRONG_PARAM_COUNT;
@@ -1290,6 +1293,24 @@
Z_STRLEN_P(return_value) = 
strlen(Z_STRVAL_P(return_value));
Z_TYPE_P(return_value) = IS_STRING;
break;
+   case PHP_PG_FIELD_TYPE_OID:
+   
+   oid = PQftype(pgsql_result, Z_LVAL_PP(field));
+
+   if (oid  LONG_MAX) {
+   smart_str s = {0};
+   smart_str_append_unsigned(s, oid);
+   smart_str_0(s);
+   Z_STRVAL_P(return_value) = s.c;
+   Z_STRLEN_P(return_value) = s.len;
+   Z_TYPE_P(return_value) = IS_STRING;
+   }
+   else
+   {
+   Z_LVAL_P(return_value) = (long)oid;
+   Z_TYPE_P(return_value) = IS_LONG;
+   }
+   break;
default:
RETURN_FALSE;
}
@@ -1320,6 +1341,15 @@
 }
 /* }}} */
 
+
+/* {{{ proto string pg_field_type_oid(resource result, int field_number)
+   Returns the type oid for the given field */
+PHP_FUNCTION(pg_field_type_oid)
+{
+
php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_TYPE_OID);
+}
+/* }}} */
+
 /* {{{ proto int pg_field_num(resource result, string field_name)
Returns the field number of the named field */
 PHP_FUNCTION(pg_field_num)
http://cvs.php.net/diff.php/php-src/ext/pgsql/php_pgsql.h?r1=1.67r2=1.68ty=u
Index: php-src/ext/pgsql/php_pgsql.h
diff -u php-src/ext/pgsql/php_pgsql.h:1.67 php-src/ext/pgsql/php_pgsql.h:1.68
--- php-src/ext/pgsql/php_pgsql.h:1.67  Thu Jan  8 12:32:40 2004
+++ php-src/ext/pgsql/php_pgsql.h   Mon Feb 14 18:36:16 2005
@@ -17,7 +17,7 @@
+--+
  */
  
-/* $Id: php_pgsql.h,v 1.67 2004/01/08 17:32:40 sniper Exp $ */
+/* $Id: php_pgsql.h,v 1.68 2005/02/14 23:36:16 edink Exp $ */
 
 #ifndef PHP_PGSQL_H
 #define PHP_PGSQL_H
@@ -98,6 +98,7 @@
 PHP_FUNCTION(pg_field_num);
 PHP_FUNCTION(pg_field_size);
 PHP_FUNCTION(pg_field_type);
+PHP_FUNCTION(pg_field_type_oid);
 PHP_FUNCTION(pg_field_prtlen);
 PHP_FUNCTION(pg_field_is_null);
 /* async message functions */

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

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

2005-02-14 Thread Edin Kadribasic

edink   Mon Feb 14 18:40:25 2005 EDT

  Modified files:  
/php-src/ext/pgsql  pgsql.c 
  Log:
  ws fix
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.313r2=1.314ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.313 php-src/ext/pgsql/pgsql.c:1.314
--- php-src/ext/pgsql/pgsql.c:1.313 Mon Feb 14 18:36:16 2005
+++ php-src/ext/pgsql/pgsql.c   Mon Feb 14 18:40:24 2005
@@ -19,7 +19,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.313 2005/02/14 23:36:16 edink Exp $ */
+/* $Id: pgsql.c,v 1.314 2005/02/14 23:40:24 edink Exp $ */
 
 #include stdlib.h
 
@@ -1346,7 +1346,7 @@
Returns the type oid for the given field */
 PHP_FUNCTION(pg_field_type_oid)
 {
-
php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_TYPE_OID);
+   
php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_FIELD_TYPE_OID);
 }
 /* }}} */
 

-- 
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/pgsql config.w32

2005-02-14 Thread Edin Kadribasic

edink   Mon Feb 14 18:41:05 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/pgsql  config.w32 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/pgsql/config.w32?r1=1.2r2=1.2.2.1ty=u
Index: php-src/ext/pgsql/config.w32
diff -u php-src/ext/pgsql/config.w32:1.2 php-src/ext/pgsql/config.w32:1.2.2.1
--- php-src/ext/pgsql/config.w32:1.2Thu Dec  4 20:03:34 2003
+++ php-src/ext/pgsql/config.w32Mon Feb 14 18:41:04 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.2 2003/12/05 01:03:34 edink Exp $
+// $Id: config.w32,v 1.2.2.1 2005/02/14 23:41:04 edink Exp $
 // vim:ft=javascript
 
 ARG_WITH(pgsql, PostgreSQL support, no);
@@ -8,7 +8,7 @@
CHECK_HEADER_ADD_INCLUDE(libpq-fe.h, CFLAGS_PGSQL, 
PHP_PHP_BUILD + \\include\\pgsql; + PHP_PGSQL)) {
EXTENSION(pgsql, pgsql.c);
AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library');
-   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PQCMDTUPLES /D 
HAVE_PQCLIENTENCODING /D HAVE_PQESCAPE /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS);
+   ADD_FLAG(CFLAGS_PGSQL, /D HAVE_PG_CONFIG_H /D PGSQL_EXPORTS 
/D HAVE_PQSETNONBLOCKING /D HAVE_PQCMDTUPLES /D HAVE_PQCLIENTENCODING /D 
HAVE_PQESCAPE /D HAVE_PQPARAMETERSTATUS /D HAVE_PGTRANSACTIONSTATUS);
} else {
WARNING(pgsql not enabled; libraries and headers not found);
}



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

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

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 18:44:24 2005 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  - More sock-error resets
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.168r2=1.169ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.168 php-src/ext/sockets/sockets.c:1.169
--- php-src/ext/sockets/sockets.c:1.168 Mon Feb 14 17:16:06 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 18:44:23 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.168 2005/02/14 22:16:06 sniper Exp $ */
+/* $Id: sockets.c,v 1.169 2005/02/14 23:44:23 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1052,6 +1052,8 @@
RETURN_FALSE;
}
 
+   php_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -1688,6 +1690,8 @@
php_sock[1]-bsd_socket = fds_array[1];
php_sock[0]-type   = domain;
php_sock[1]-type   = domain;
+   php_sock[0]-error  = 0;
+   php_sock[1]-error  = 0;
 
ZEND_REGISTER_RESOURCE(retval[0], php_sock[0], le_socket);
ZEND_REGISTER_RESOURCE(retval[1], php_sock[1], le_socket);

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

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 18:44:31 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/socketssockets.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.165.2.2r2=1.165.2.3ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.165.2.2 
php-src/ext/sockets/sockets.c:1.165.2.3
--- php-src/ext/sockets/sockets.c:1.165.2.2 Sat Feb 12 13:15:03 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 18:44:31 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.165.2.2 2005/02/12 18:15:03 sniper Exp $ */
+/* $Id: sockets.c,v 1.165.2.3 2005/02/14 23:44:31 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -663,6 +663,8 @@
RETURN_FALSE;
}
 
+   php_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -681,10 +683,11 @@
ZEND_FETCH_RESOURCE(php_sock, php_socket *, arg1, -1, le_socket_name, 
le_socket);

if (!php_accept_connect(php_sock, new_sock, (struct sockaddr *) sa 
TSRMLS_CC)) {
-   PHP_SOCKET_ERROR(new_sock, unable to accept socket 
connection, errno);
RETURN_FALSE;
}
-   
+
+   new_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, new_sock, le_socket);
 }
 /* }}} */
@@ -1049,6 +1052,8 @@
RETURN_FALSE;
}
 
+   php_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -1685,6 +1690,8 @@
php_sock[1]-bsd_socket = fds_array[1];
php_sock[0]-type   = domain;
php_sock[1]-type   = domain;
+   php_sock[0]-error  = 0;
+   php_sock[1]-error  = 0;
 
ZEND_REGISTER_RESOURCE(retval[0], php_sock[0], le_socket);
ZEND_REGISTER_RESOURCE(retval[1], php_sock[1], le_socket);

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 18:46:07 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/socketssockets.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.27r2=1.125.2.28ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.27 
php-src/ext/sockets/sockets.c:1.125.2.28
--- php-src/ext/sockets/sockets.c:1.125.2.27Mon Feb 14 17:18:46 2005
+++ php-src/ext/sockets/sockets.c   Mon Feb 14 18:46:07 2005
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.125.2.27 2005/02/14 22:18:46 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.28 2005/02/14 23:46:07 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -990,6 +990,8 @@
RETURN_FALSE;
}
 
+   php_sock-error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -2031,6 +2033,8 @@
php_sock[1]-bsd_socket = fds_array[1];
php_sock[0]-type   = domain;
php_sock[1]-type   = domain;
+   php_sock[0]-error  = 0;
+   php_sock[1]-error  = 0;
 
ZEND_REGISTER_RESOURCE(retval[0], php_sock[0], le_socket);
ZEND_REGISTER_RESOURCE(retval[1], php_sock[1], le_socket);

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

Re: [PHP-CVS] cvs: php-src /ext/standard var_unserializer.re

2005-02-14 Thread Jani Taskinen

Why not MFH to PHP_4_3 ? (or doesn't this apply there..? :)
--Jani
On Mon, 14 Feb 2005, Marcus Boerger wrote:
helly   Mon Feb 14 15:58:25 2005 EDT
 Modified files:
   /php-src/ext/standardvar_unserializer.re
 Log:
 - Disallow illegal class names
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.40r2=1.41ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.40 
php-src/ext/standard/var_unserializer.re:1.41
--- php-src/ext/standard/var_unserializer.re:1.40   Sun Jan 30 11:38:53 2005
+++ php-src/ext/standard/var_unserializer.reMon Feb 14 15:58:22 2005
@@ -16,7 +16,7 @@
  +--+
*/
-/* $Id: var_unserializer.re,v 1.40 2005/01/30 16:38:53 iliaa Exp $ */
+/* $Id: var_unserializer.re,v 1.41 2005/02/14 20:58:22 helly Exp $ */
#include php.h
#include ext/standard/php_var.h
@@ -473,7 +473,7 @@
}
O: uiv : []   {
-   size_t len, len2, maxlen;
+   size_t len, len2, len3, maxlen;
int elements;
char *class_name;
zend_class_entry *ce;
@@ -506,6 +506,13 @@
return 0;
}
+   len3 = strspn(class_name, 
0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ);
+   if (len3 != len)
+   {
+   *p = YYCURSOR + len3 - len;
+   return 0;
+   }
+
class_name = estrndup(class_name, len);
do {

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

[PHP-CVS] cvs: php-src /main rfc1867.c

2005-02-14 Thread Ilia Alshanetsky

iliaa   Mon Feb 14 19:25:39 2005 EDT

  Modified files:  
/php-src/main   rfc1867.c 
  Log:
  Prune uploaded file names to \ on all OSes, read comments for explanation.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.169r2=1.170ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.169 php-src/main/rfc1867.c:1.170
--- php-src/main/rfc1867.c:1.169Mon Jan 31 21:33:07 2005
+++ php-src/main/rfc1867.c  Mon Feb 14 19:25:38 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.169 2005/02/01 02:33:07 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.170 2005/02/15 00:25:38 iliaa Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1077,11 +1077,7 @@
str_len = strlen(filename);

php_mb_gpc_encoding_converter(filename, str_len, 1, NULL, NULL TSRMLS_CC);
}
-#ifdef PHP_WIN32
s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-#else
-   s = filename;
-#endif
if ((tmp = php_mb_strrchr(filename, '/' 
TSRMLS_CC))  s) {
s = tmp;
}
@@ -1089,12 +1085,13 @@
goto filedone;
}
 #endif 
-
-#ifdef PHP_WIN32
+   /* The \ check should technically be needed for win32 
systems only where
+* it is a valid path separator. However, IE in all 
it's wisdom always sends
+* the full path of the file on the user's filesystem, 
which means that unless
+* the user does basename() they get a bogus file name. 
Until IE's user base drops 
+* to nill or problem is fixed this code must remain 
enabled for all systems.
+*/
s = strrchr(filename, '\\');
-#else
-   s = filename;
-#endif
if ((tmp = strrchr(filename, '/'))  s) {
s = tmp;
}

-- 
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) /main rfc1867.c

2005-02-14 Thread Ilia Alshanetsky

iliaa   Mon Feb 14 19:26:35 2005 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/main   rfc1867.c 
  Log:
  MFH: file upload path prunning.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.10r2=1.159.2.11ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159.2.10 php-src/main/rfc1867.c:1.159.2.11
--- php-src/main/rfc1867.c:1.159.2.10   Mon Jan 31 21:33:17 2005
+++ php-src/main/rfc1867.c  Mon Feb 14 19:26:35 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.159.2.10 2005/02/01 02:33:17 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.159.2.11 2005/02/15 00:26:35 iliaa Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1077,11 +1077,7 @@
str_len = strlen(filename);

php_mb_gpc_encoding_converter(filename, str_len, 1, NULL, NULL TSRMLS_CC);
}
-#ifdef PHP_WIN32
s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-#else
-   s = filename;
-#endif
if ((tmp = php_mb_strrchr(filename, '/' 
TSRMLS_CC))  s) {
s = tmp;
}
@@ -1090,11 +1086,7 @@
}
 #endif
 
-#ifdef PHP_WIN32
s = strrchr(filename, '\\');
-#else
-   s = filename;
-#endif
if ((tmp = strrchr(filename, '/'))  s) {
s = tmp;
}

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

[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c

2005-02-14 Thread Ilia Alshanetsky

iliaa   Mon Feb 14 19:28:40 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/main   rfc1867.c 
  Log:
  MFH: file upload prunning.
  
  
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.32r2=1.122.2.33ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.32 php-src/main/rfc1867.c:1.122.2.33
--- php-src/main/rfc1867.c:1.122.2.32   Mon Jan 31 21:33:25 2005
+++ php-src/main/rfc1867.c  Mon Feb 14 19:28:39 2005
@@ -16,7 +16,7 @@
|  Jani Taskinen [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: rfc1867.c,v 1.122.2.32 2005/02/01 02:33:25 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.33 2005/02/15 00:28:39 iliaa Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1064,11 +1064,7 @@
str_len = strlen(filename);

php_mb_gpc_encoding_converter(filename, str_len, 1, NULL, NULL TSRMLS_CC);
}
-#ifdef PHP_WIN32
s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-#else
-   s = filename;
-#endif
if ((tmp = php_mb_strrchr(filename, '/' 
TSRMLS_CC))  s) {
s = tmp;
}
@@ -1076,11 +1072,7 @@
goto filedone;
}
 #endif
-#ifdef PHP_WIN32
s = strrchr(filename, '\\');
-#else
-   s = filename;
-#endif
if ((tmp = strrchr(filename, '/'))  s) {
s = tmp;
}

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

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc .cvsignore

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 20:30:42 2005 EDT

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   .cvsignore 
  Log:
  Missing .libs entry
  
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/.cvsignore?r1=1.4r2=1.5ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/.cvsignore
diff -u php-src/ext/xmlrpc/libxmlrpc/.cvsignore:1.4 
php-src/ext/xmlrpc/libxmlrpc/.cvsignore:1.5
--- php-src/ext/xmlrpc/libxmlrpc/.cvsignore:1.4 Sun Oct 10 12:10:26 2004
+++ php-src/ext/xmlrpc/libxmlrpc/.cvsignore Mon Feb 14 20:30:40 2005
@@ -1,3 +1,4 @@
+.libs
 .deps
 *.lo
 *.la

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

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

2005-02-14 Thread Jani Taskinen

sniper  Mon Feb 14 20:44:10 2005 EDT

  Modified files:  
/php-src/ext/domconfig.m4 
  Log:
  No tabs here
  
http://cvs.php.net/diff.php/php-src/ext/dom/config.m4?r1=1.16r2=1.17ty=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.16 php-src/ext/dom/config.m4:1.17
--- php-src/ext/dom/config.m4:1.16  Sun Jul 18 08:03:51 2004
+++ php-src/ext/dom/config.m4   Mon Feb 14 20:44:10 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.16 2004/07/18 12:03:51 wez Exp $
+dnl $Id: config.m4,v 1.17 2005/02/15 01:44:10 sniper Exp $
 dnl
 
 PHP_ARG_ENABLE(dom, whether to enable DOM support,
@@ -26,7 +26,7 @@
 typeinfo.c domerror.c domlocator.c namednodemap.c 
userdatahandler.c], 
 $ext_shared)
 PHP_SUBST(DOM_SHARED_LIBADD)
-   PHP_ADD_EXTENSION_DEP(dom, libxml)
+PHP_ADD_EXTENSION_DEP(dom, libxml)
   ], [
 AC_MSG_ERROR([xml2-config not found. Please check your libxml2 
installation.])
   ])

-- 
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 /ext/sockets php_sockets.h

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets php_sockets.h

[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended

[PHP-CVS] cvs: php-src(PHP_4_3) / php.ini-dist php.ini-recommended

[PHP-CVS] cvs: php-src /main php.h

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard var_unserializer.re

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

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

[PHP-CVS] cvs: php-src /ext/standard var_unserializer.re

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

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

[PHP-CVS] cvs: php-src /ext/pgsql config.w32

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

[PHP-CVS] cvs: php-src / NEWS /ext/pgsql pgsql.c php_pgsql.h

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

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

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

[PHP-CVS] cvs: php-src(PHP_5_0) /ext/sockets sockets.c

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sockets sockets.c

Re: [PHP-CVS] cvs: php-src /ext/standard var_unserializer.re

[PHP-CVS] cvs: php-src /main rfc1867.c

[PHP-CVS] cvs: php-src(PHP_5_0) /main rfc1867.c

[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc .cvsignore

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

27 matches

Site Navigation

Mail list logo

Footer information