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

2004-07-14 Thread Derick Rethans 
On Tue, 13 Jul 2004, Jon Parise wrote:

 On Tue, Jul 13, 2004 at 12:58:34PM -, Derick Rethans wrote:

  derick  Tue Jul 13 08:58:34 2004 EDT
 
Modified files:  (Branch: PHP_4_3_7)
  /php-srcconfigure.in
  /php-src/main   php_version.h
Log:
- Create a branch PHP_4_3_7 based on php 4.3.7 to form 4.3.8
- Updated version numbers in branch

 While creating this branch makes sense, I don't understand why it's
 not named PHP_4_3_8.

Because it's a branch created from php_4_3_7.

Derick

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

Re: [PHP-CVS] cvs: php-src / NEWS configure.in /main php_version.h ZendEngine2 zend.h

2004-07-14 Thread Derick Rethans 
On Tue, 13 Jul 2004, Andi Gutmans wrote:

 andi  Tue Jul 13 15:56:49 2004 EDT

   Modified files:
 /php-src  NEWS configure.in
 /ZendEngine2  zend.h
 /php-src/main php_version.h
   Log:
   - 5.0.1-dev

I was under the impression that we were going to branch to PHP_5_0, and
make HEAD 5.1.x ?

Derick

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

[PHP-CVS] cvs: php-src /sapi/apache mod_php5.c

2004-07-14 Thread Stefan Esser 
sesser  Wed Jul 14 05:43:26 2004 EDT

  Modified files:  
/php-src/sapi/apachemod_php5.c 
  Log:
  Security Fix broken! Destroyed Basic auth. Blame: me
  4.3.x not affected
  
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.9r2=1.10ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.9 php-src/sapi/apache/mod_php5.c:1.10
--- php-src/sapi/apache/mod_php5.c:1.9  Sat Jul 10 03:46:09 2004
+++ php-src/sapi/apache/mod_php5.c  Wed Jul 14 05:43:26 2004
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  |
+--+
  */
-/* $Id: mod_php5.c,v 1.9 2004/07/10 07:46:09 andi Exp $ */
+/* $Id: mod_php5.c,v 1.10 2004/07/14 09:43:26 sesser Exp $ */
 
 #include php_apache_http.h
 #include http_conf_globals.h
@@ -485,7 +485,7 @@
tmp = uudecode(r-pool, authorization);
SG(request_info).auth_user = NULL;
tmp_user = getword_nulls_nc(r-pool, tmp, ':');
-   if (SG(request_info).auth_user) {
+   if (tmp_user) {
r-connection-user = pstrdup(r-connection-pool, tmp_user);
r-connection-ap_auth_type = Basic;
SG(request_info).auth_user = estrdup(tmp_user);

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

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

2004-07-14 Thread Derick Rethans 
derick  Wed Jul 14 05:54:02 2004 EDT

  Modified files:  
/php-src/ext/iconv  config.m4 
  Log:
  - Fixed text.
  
  
http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.26r2=1.27ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.26 php-src/ext/iconv/config.m4:1.27
--- php-src/ext/iconv/config.m4:1.26Wed Apr 14 03:42:38 2004
+++ php-src/ext/iconv/config.m4 Wed Jul 14 05:54:02 2004
@@ -1,9 +1,9 @@
 dnl
-dnl $Id: config.m4,v 1.26 2004/04/14 07:42:38 derick Exp $
+dnl $Id: config.m4,v 1.27 2004/07/14 09:54:02 derick Exp $
 dnl
 
 PHP_ARG_WITH(iconv, for iconv support,
-[  --without-iconv[=DIR]   Include iconv support], yes)
+[  --without-iconv[=DIR]   Exclude iconv support], yes)
 
 if test $PHP_ICONV != no; then
 

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

[PHP-CVS] cvs: php-src /sapi/apache_hooks mod_php5.c

2004-07-14 Thread Stefan Esser 
sesser  Wed Jul 14 05:55:25 2004 EDT

  Modified files:  
/php-src/sapi/apache_hooks  mod_php5.c 
  Log:
  same bug.
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.3r2=1.4ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.3 
php-src/sapi/apache_hooks/mod_php5.c:1.4
--- php-src/sapi/apache_hooks/mod_php5.c:1.3Sat Jul 10 03:46:09 2004
+++ php-src/sapi/apache_hooks/mod_php5.cWed Jul 14 05:55:24 2004
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]  
   |
+--+
  */
-/* $Id: mod_php5.c,v 1.3 2004/07/10 07:46:09 andi Exp $ */
+/* $Id: mod_php5.c,v 1.4 2004/07/14 09:55:24 sesser Exp $ */
 
 #include php_apache_http.h
 
@@ -583,7 +583,7 @@
tmp = uudecode(r-pool, authorization);
SG(request_info).auth_user = NULL;
tmp_user = getword_nulls_nc(r-pool, tmp, ':');
-   if (SG(request_info).auth_user) {
+   if (tmp_user) {
r-connection-user = pstrdup(r-connection-pool, tmp_user);
r-connection-ap_auth_type = Basic;
SG(request_info).auth_user = estrdup(tmp_user);

-- 
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_7) /ext/standard/tests/strings strip_tags.phpt

2004-07-14 Thread Stefan Esser 
sesser  Wed Jul 14 07:24:12 2004 EDT

  Modified files:  (Branch: PHP_4_3_7)
/php-src/ext/standard/tests/strings strip_tags.phpt 
  Log:
  Add CAN-2004-0595 regression test. (modified from Joe Ortons version)
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/strip_tags.phpt?r1=1.1.2.1r2=1.1.2.1.2.1ty=u
Index: php-src/ext/standard/tests/strings/strip_tags.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.1  Wed Nov 27 01:20:37 
2002
+++ php-src/ext/standard/tests/strings/strip_tags.phpt  Wed Jul 14 07:24:12 2004
@@ -18,6 +18,7 @@
echo \n;
echo strip_tags('TESTS ?!!?!?!!!?!!');
echo \n;
+   echo strip_tags('iCAN-2004-'.chr(0).'b0595/i', 'i');
 ?
 --EXPECT--
 NEAT  STUFF
@@ -27,3 +28,4 @@
 NEAT  STUFF
 NEAT  STUFF
 TESTS ?!!?!?!!!?!!
+iCAN-2004-0595/i

-- 
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/standard/tests/strings strip_tags.phpt

2004-07-14 Thread Stefan Esser 
sesser  Wed Jul 14 07:32:47 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/standard/tests/strings strip_tags.phpt 
  Log:
  Ups... CAN-2004-0595 regression test went into wrong branch...
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/strip_tags.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/standard/tests/strings/strip_tags.phpt
diff -u php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.1 
php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/strip_tags.phpt:1.1.2.1  Wed Nov 27 01:20:37 
2002
+++ php-src/ext/standard/tests/strings/strip_tags.phpt  Wed Jul 14 07:32:47 2004
@@ -18,6 +18,7 @@
echo \n;
echo strip_tags('TESTS ?!!?!?!!!?!!');
echo \n;
+   echo strip_tags('iCAN-2004-'.chr(0).'b0595/i', 'i');
 ?
 --EXPECT--
 NEAT  STUFF
@@ -27,3 +28,4 @@
 NEAT  STUFF
 NEAT  STUFF
 TESTS ?!!?!?!!!?!!
+iCAN-2004-0595/i

-- 
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 /sapi/cli php_cli.c

2004-07-14 Thread Edin Kadribasic 
edink   Wed Jul 14 18:30:29 2004 EDT

  Modified files:  
/php-src/sapi/cgi   cgi_main.c 
/php-src/sapi/cli   php_cli.c 
  Log:
  Made php -m output sorted case-insensitevly
  
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.255r2=1.256ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.255 php-src/sapi/cgi/cgi_main.c:1.256
--- php-src/sapi/cgi/cgi_main.c:1.255   Mon Jul  5 07:41:31 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Jul 14 18:30:27 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.255 2004/07/05 11:41:31 sas Exp $ */
+/* $Id: cgi_main.c,v 1.256 2004/07/14 22:30:27 edink Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -177,7 +177,7 @@
Bucket *f = *((Bucket **) a);
Bucket *s = *((Bucket **) b);
 
-   return strcmp(((zend_module_entry *)f-pData)-name,
+   return strcasecmp(((zend_module_entry *)f-pData)-name,
  ((zend_module_entry *)s-pData)-name);
 }
 
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.112r2=1.113ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.112 php-src/sapi/cli/php_cli.c:1.113
--- php-src/sapi/cli/php_cli.c:1.112Thu Mar  4 17:53:09 2004
+++ php-src/sapi/cli/php_cli.c  Wed Jul 14 18:30:29 2004
@@ -19,7 +19,7 @@
+--+
 */
 
-/* $Id: php_cli.c,v 1.112 2004/03/04 22:53:09 moriyoshi Exp $ */
+/* $Id: php_cli.c,v 1.113 2004/07/14 22:30:29 edink Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -132,7 +132,7 @@
Bucket *f = *((Bucket **) a);
Bucket *s = *((Bucket **) b);
 
-   return strcmp(((zend_module_entry *)f-pData)-name,
+   return strcasecmp(((zend_module_entry *)f-pData)-name,
  ((zend_module_entry *)s-pData)-name);
 }
 

-- 
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) /sapi/cgi cgi_main.c /sapi/cli php_cli.c

2004-07-14 Thread Edin Kadribasic 
edink   Wed Jul 14 18:38:19 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/cgi   cgi_main.c 
/php-src/sapi/cli   php_cli.c 
  Log:
  MFH: Made php -m output sorted case-insensitevly
  
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.61r2=1.190.2.62ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.61 php-src/sapi/cgi/cgi_main.c:1.190.2.62
--- php-src/sapi/cgi/cgi_main.c:1.190.2.61  Mon Jul  5 07:40:28 2004
+++ php-src/sapi/cgi/cgi_main.c Wed Jul 14 18:38:18 2004
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.190.2.61 2004/07/05 11:40:28 sas Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.62 2004/07/14 22:38:18 edink Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -177,7 +177,7 @@
Bucket *f = *((Bucket **) a);
Bucket *s = *((Bucket **) b);
 
-   return strcmp(((zend_module_entry *)f-pData)-name,
+   return strcasecmp(((zend_module_entry *)f-pData)-name,
  ((zend_module_entry *)s-pData)-name);
 }
 
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.51.2.34r2=1.51.2.35ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.34 php-src/sapi/cli/php_cli.c:1.51.2.35
--- php-src/sapi/cli/php_cli.c:1.51.2.34Wed Feb 11 17:00:36 2004
+++ php-src/sapi/cli/php_cli.c  Wed Jul 14 18:38:18 2004
@@ -130,7 +130,7 @@
Bucket *f = *((Bucket **) a);
Bucket *s = *((Bucket **) b);
 
-   return strcmp(((zend_module_entry *)f-pData)-name,
+   return strcasecmp(((zend_module_entry *)f-pData)-name,
  ((zend_module_entry *)s-pData)-name);
 }
 

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