[PHP-CVS] cvs: php-src /ext/dom text.c /ext/dom/tests bug46335.phpt

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 12:44:28 2008 UTC

  Added files: 
/php-src/ext/dom/tests  bug46335.phpt 

  Modified files:  
/php-src/ext/domtext.c 
  Log:
  fix bug #46335 (DOMText::splitText doesn't handle multibyte characters)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.39&r2=1.40&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.39 php-src/ext/dom/text.c:1.40
--- php-src/ext/dom/text.c:1.39 Wed Sep 10 15:39:43 2008
+++ php-src/ext/dom/text.c  Mon Oct 20 12:44:28 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: text.c,v 1.39 2008/09/10 15:39:43 rrichards Exp $ */
+/* $Id: text.c,v 1.40 2008/10/20 12:44:28 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -171,19 +171,19 @@
if (cur == NULL) {
RETURN_FALSE;
}
-   length = xmlStrlen(cur);
+   length = xmlUTF8Strlen(cur);
 
if (offset > length || offset < 0) {
xmlFree(cur);
RETURN_FALSE;
}
 
-   first = xmlStrndup(cur, offset);
-   second = xmlStrdup(cur + offset);
+   first = xmlUTF8Strndup(cur, offset);
+   second = xmlUTF8Strsub(cur, offset, length - offset);

xmlFree(cur);
 
-   xmlNodeSetContentLen(node, first, offset);
+   xmlNodeSetContent(node, first);
nnode = xmlNewDocText(node->doc, second);

xmlFree(first);

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug46335.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/bug46335.phpt
+++ php-src/ext/dom/tests/bug46335.phpt
--TEST--
Bug #46335 (DOMText::splitText doesn't handle multibyte characters).
--SKIPIF--

--FILE--
createTextNode($textascii);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (ASCII): $matched->textContent\n";

$node = $dom->createTextNode($text);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (UTF-8): $matched->textContent\n";
?>
--EXPECT--
Text: This is an "example" of using DOM splitText
splitText (ASCII): DOM
Text: This is an ‘example’ of using DOM splitText
splitText (UTF-8): DOM



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom text.c /ext/dom/tests bug46335.phpt

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 12:45:47 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests  bug46335.phpt 

  Modified files:  
/php-src/ext/domtext.c 
  Log:
  MFH: fix bug #46335 (DOMText::splitText doesn't handle multibyte characters)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.4.2.6&r2=1.23.2.1.2.4.2.7&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.23.2.1.2.4.2.6 
php-src/ext/dom/text.c:1.23.2.1.2.4.2.7
--- php-src/ext/dom/text.c:1.23.2.1.2.4.2.6 Wed Sep 10 15:40:11 2008
+++ php-src/ext/dom/text.c  Mon Oct 20 12:45:47 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: text.c,v 1.23.2.1.2.4.2.6 2008/09/10 15:40:11 rrichards Exp $ */
+/* $Id: text.c,v 1.23.2.1.2.4.2.7 2008/10/20 12:45:47 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -171,19 +171,19 @@
if (cur == NULL) {
RETURN_FALSE;
}
-   length = xmlStrlen(cur);
+   length = xmlUTF8Strlen(cur);
 
if (offset > length || offset < 0) {
xmlFree(cur);
RETURN_FALSE;
}
 
-   first = xmlStrndup(cur, offset);
-   second = xmlStrdup(cur + offset);
+   first = xmlUTF8Strndup(cur, offset);
+   second = xmlUTF8Strsub(cur, offset, length - offset);

xmlFree(cur);
 
-   xmlNodeSetContentLen(node, first, offset);
+   xmlNodeSetContent(node, first);
nnode = xmlNewDocText(node->doc, second);

xmlFree(first);

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug46335.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/bug46335.phpt
+++ php-src/ext/dom/tests/bug46335.phpt
--TEST--
Bug #46335 (DOMText::splitText doesn't handle multibyte characters).
--SKIPIF--

--FILE--
createTextNode($textascii);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (ASCII): $matched->textContent\n";

$node = $dom->createTextNode($text);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (UTF-8): $matched->textContent\n";
?>
--EXPECT--
Text: This is an "example" of using DOM splitText
splitText (ASCII): DOM
Text: This is an ‘example’ of using DOM splitText
splitText (UTF-8): DOM



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom text.c /ext/dom/tests bug46335.phpt

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 12:46:23 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests  bug46335.phpt 

  Modified files:  
/php-src/ext/domtext.c 
  Log:
  MFH: fix bug #46335 (DOMText::splitText doesn't handle multibyte characters)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.7&r2=1.23.2.1.2.8&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.23.2.1.2.7 php-src/ext/dom/text.c:1.23.2.1.2.8
--- php-src/ext/dom/text.c:1.23.2.1.2.7 Wed Sep 10 15:40:34 2008
+++ php-src/ext/dom/text.c  Mon Oct 20 12:46:23 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: text.c,v 1.23.2.1.2.7 2008/09/10 15:40:34 rrichards Exp $ */
+/* $Id: text.c,v 1.23.2.1.2.8 2008/10/20 12:46:23 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -172,19 +172,19 @@
if (cur == NULL) {
RETURN_FALSE;
}
-   length = xmlStrlen(cur);
+   length = xmlUTF8Strlen(cur);
 
if (offset > length || offset < 0) {
xmlFree(cur);
RETURN_FALSE;
}
 
-   first = xmlStrndup(cur, offset);
-   second = xmlStrdup(cur + offset);
+   first = xmlUTF8Strndup(cur, offset);
+   second = xmlUTF8Strsub(cur, offset, length - offset);

xmlFree(cur);
 
-   xmlNodeSetContentLen(node, first, offset);
+   xmlNodeSetContent(node, first);
nnode = xmlNewDocText(node->doc, second);

xmlFree(first);

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug46335.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/bug46335.phpt
+++ php-src/ext/dom/tests/bug46335.phpt
--TEST--
Bug #46335 (DOMText::splitText doesn't handle multibyte characters).
--SKIPIF--

--FILE--
createTextNode($textascii);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (ASCII): $matched->textContent\n";

$node = $dom->createTextNode($text);
$dom->appendChild($node);

print "Text: $node->textContent\n";

$matched = $node->splitText($start);
$matched->splitText($length);
print "splitText (UTF-8): $matched->textContent\n";
?>
--EXPECT--
Text: This is an "example" of using DOM splitText
splitText (ASCII): DOM
Text: This is an ‘example’ of using DOM splitText
splitText (UTF-8): DOM



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

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

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 12:46:58 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1264&r2=1.2027.2.547.2.1265&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1264 php-src/NEWS:1.2027.2.547.2.1265
--- php-src/NEWS:1.2027.2.547.2.1264Sun Oct 19 18:16:43 2008
+++ php-src/NEWSMon Oct 20 12:46:57 2008
@@ -3,6 +3,8 @@
 ?? Oct 2008, PHP 5.2.7RC2
 - Fixed bug #46341 (Added missing validation checks into define() for class
   constants). (Ilia)
+- Fixed bug #46335 (DOMText::splitText doesn't handle multibyte characters).
+  (Rob)
 - Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
   response code, in cgi sapi). (Ilia)
 - Fixed bug #46308 (Invalid write when changing property from inside getter).



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo config.w32 /ext/fileinfo/libmagic apprentice.c softmagic.c

2008-10-20 Thread Pierre-Alain Joye 
pajoye  Mon Oct 20 14:45:59 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/fileinfo   config.w32 
/php-src/ext/fileinfo/libmagic  apprentice.c softmagic.c 
  Log:
  - support for VC6 and some other platforms (before some other cleanup)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.w32?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/fileinfo/config.w32
diff -u php-src/ext/fileinfo/config.w32:1.1.2.2 
php-src/ext/fileinfo/config.w32:1.1.2.3
--- php-src/ext/fileinfo/config.w32:1.1.2.2 Thu Jul 31 13:13:20 2008
+++ php-src/ext/fileinfo/config.w32 Mon Oct 20 14:45:59 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.2 2008/07/31 13:13:20 pajoye Exp $
+// $Id: config.w32,v 1.1.2.3 2008/10/20 14:45:59 pajoye Exp $
 // vim:ft=javascript
 
 ARG_ENABLE("fileinfo", "fileinfo support", "no");
@@ -13,6 +13,10 @@
magic.c print.c \
readelf.c softmagic.c";
 
+   if (VCVERS <1500) {
+   ADD_FLAG('CFLAGS', '/Zm1000');
+   }
+
EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + 
configure_module_dirname + "/libmagic /I" + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + '\\libmagic', 
LIBMAGIC_SOURCES, "fileinfo");
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.7.2.7&r2=1.7.2.8&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.7 
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.8
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.7  Wed Oct 15 22:56:57 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Mon Oct 20 14:45:59 2008
@@ -38,11 +38,17 @@
 
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
+#if _MSC_VER <= 1300
+#include "win32/php_strtoi64.h"
+#endif
 #define strtoull _strtoui64
 #else
 #include 
 #endif
 
+
+
+
 #include 
 #include 
 #include 
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.5 
php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.6
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.5   Wed Oct 15 22:56:57 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c   Mon Oct 20 14:45:59 2008
@@ -582,16 +582,16 @@
if (m->num_mask) \
switch (m->mask_op & FILE_OPS_MASK) { \
case FILE_OPADD: \
-   p->fld += cast m->num_mask; \
+   p->fld += cast (int64_t)m->num_mask; \
break; \
case FILE_OPMINUS: \
-   p->fld -= cast m->num_mask; \
+   p->fld -= cast (int64_t)m->num_mask; \
break; \
case FILE_OPMULTIPLY: \
-   p->fld *= cast m->num_mask; \
+   p->fld *= cast (int64_t)m->num_mask; \
break; \
case FILE_OPDIVIDE: \
-   p->fld /= cast m->num_mask; \
+   p->fld /= cast (int64_t)m->num_mask; \
break; \
} \
 
@@ -1860,7 +1860,7 @@
case 'x':
if ((ms->flags & MAGIC_DEBUG) != 0)
(void) fprintf(stderr, "%llu == *any* = 1\n",
-   (unsigned long long)v);
+   (uint64_t)v);
matched = 1;
break;
 
@@ -1868,7 +1868,7 @@
matched = v != l;
if ((ms->flags & MAGIC_DEBUG) != 0)
(void) fprintf(stderr, "%llu != %llu = %d\n",
-   (unsigned long long)v, (unsigned long long)l,
+   (uint64_t)v, (uint64_t)l,
matched);
break;
 
@@ -1876,7 +1876,7 @@
matched = v == l;
if ((ms->flags & MAGIC_DEBUG) != 0)
(void) fprintf(stderr, "%llu == %llu = %d\n",
-   (unsigned long long)v, (unsigned long long)l,
+   (uint64_t)v, (uint64_t)l,
matched);
break;
 
@@ -1885,14 +1885,14 @@
matched = v > l;
if ((ms->flags & MAGIC_DEBUG) != 0)
(void) fprintf(stderr, "%llu > %llu = %d\n",
-   (unsigned long long)v,
-   (unsigned long long)l, matched);
+   (uint64_t)v,
+   (uint64_t)l, matched);
}
else {
matched = (int64_t) v > (int64_t) l;
if ((ms->flags & MAGIC_DEBUG) != 0)
(void) fprintf(stderr, "%l

[PHP-CVS] cvs: php-src(PHP_5_3) /win32 php_strtoi64.h strtoi64.c

2008-10-20 Thread Pierre-Alain Joye 
pajoye  Mon Oct 20 14:47:01 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/win32  php_strtoi64.h strtoi64.c 
  Log:
  - add strto*i64 support (VC6 only, decent compilers/crt have them)
  

http://cvs.php.net/viewvc.cgi/php-src/win32/php_strtoi64.h?view=markup&rev=1.1
Index: php-src/win32/php_strtoi64.h
+++ php-src/win32/php_strtoi64.h

http://cvs.php.net/viewvc.cgi/php-src/win32/strtoi64.c?view=markup&rev=1.1
Index: php-src/win32/strtoi64.c
+++ php-src/win32/strtoi64.c



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

[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build config.w32

2008-10-20 Thread Pierre-Alain Joye 
pajoye  Mon Oct 20 14:47:33 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32 
  Log:
  - add strto*i64 (VC6, decent compilers/crt have them)
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.33&r2=1.40.2.8.2.10.2.34&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.33 
php-src/win32/build/config.w32:1.40.2.8.2.10.2.34
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.33   Fri Sep 26 13:29:11 2008
+++ php-src/win32/build/config.w32  Mon Oct 20 14:47:33 2008
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.33 2008/09/26 13:29:11 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.34 2008/10/20 14:47:33 pajoye Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
@@ -310,6 +310,11 @@
php_open_temporary_file.c php_logos.c output.c internal_functions.c 
php_sprintf.c");
 ADD_SOURCES("win32", "inet.c");
 
+// Newer versions have it
+if (VCVERS <= 1300) {
+   ADD_SOURCES("win32", "strtoi64.c");
+}
+
 ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c 
plain_wrapper.c \
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
 



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

[PHP-CVS] cvs: win-installer / ExtensionsGUID.xml GenPHPInstaller.wxs.php PHPInstallerBase52.wxs

2008-10-20 Thread Pierre-Alain Joye 
pajoye  Mon Oct 20 15:01:29 2008 UTC

  Modified files:  
/win-installer  ExtensionsGUID.xml GenPHPInstaller.wxs.php 
PHPInstallerBase52.wxs 
  Log:
  - update for 5.3, apache1 is out, some shared exts
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.10&r2=1.11&diff_format=u
Index: win-installer/ExtensionsGUID.xml
diff -u win-installer/ExtensionsGUID.xml:1.10 
win-installer/ExtensionsGUID.xml:1.11
--- win-installer/ExtensionsGUID.xml:1.10   Fri Aug 22 19:01:07 2008
+++ win-installer/ExtensionsGUID.xmlMon Oct 20 15:01:28 2008
@@ -139,4 +139,8 @@
   
   
   
+  
+  
+  
+  
 
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.8&r2=1.9&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.8 
win-installer/GenPHPInstaller.wxs.php:1.9
--- win-installer/GenPHPInstaller.wxs.php:1.8   Mon Oct 13 09:57:01 2008
+++ win-installer/GenPHPInstaller.wxs.php   Mon Oct 20 15:01:28 2008
@@ -45,7 +45,7 @@
 // remove extension info from php.ini-recommended
 $infile = fopen("Files/php.ini-recommended",'r');
 $outfile = fopen("Files/php.ini",'w');
-if (!$outfile || $infile) {
+if (!$outfile || !$infile) {
echo "Cannot open php.ini or php.ini-recommended\n";
exit(1);
 }
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.27&r2=1.28&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.27 
win-installer/PHPInstallerBase52.wxs:1.28
--- win-installer/PHPInstallerBase52.wxs:1.27   Mon Oct 13 09:57:01 2008
+++ win-installer/PHPInstallerBase52.wxsMon Oct 20 15:01:28 2008
@@ -399,10 +399,10 @@
   Title="$(loc.Featureapache13Title)" 
   Description="$(loc.Featureapache13Description)" 
   Level="10">
-
+
   
   
 



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

[PHP-CVS] cvs: CVSROOT / avail

2008-10-20 Thread Philip Olson 
philip  Mon Oct 20 15:18:05 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - phpdoc karma for Cedric Schohn (morgue)
  
  http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1457&r2=1.1458&diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1457 CVSROOT/avail:1.1458
--- CVSROOT/avail:1.1457Sun Oct 19 19:30:26 2008
+++ CVSROOT/avail   Mon Oct 20 15:18:04 2008
@@ -41,7 +41,7 @@
 # The PHP Documentation Group maintains the documentation and its
 # translations.
 
-avail|lucas,jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,c!
 
hief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,!
 abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,h
win,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj!
 
,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut,asonge,mkoppanen,ron,nicobn,jacques,void,mcbrown,simionea,preinheimer,stanprog,msaraujo,felipe,asbjornit,philippe,sezer,ka!
 lle,rmlr,hradtke,alan,danielc,danbrown,alexxed,psalehpoor,loudi,abedfo
rd|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb
+avail|lucas,jmertic,bobby,ta

[PHP-CVS] cvs: php-src(PHP_5_3) /main rfc1867.c /tests/basic bug46313-win.phpt bug46313.phpt

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudMon Oct 20 17:09:11 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/tests/basicbug46313.phpt bug46313-win.phpt 

  Modified files:  
/php-src/main   rfc1867.c 
  Log:
  Fixed #46313 (Magic quotes broke $_FILES)
  # magic_quotes_gpc was disabled during registration of 
$_FILES["x"]["tmp_name"]
  # and $GLOBALS["x"] (which is tmp_name with register_globals enabled). This
  # caused "x" to not be escaped so there was 2 different keys for the same file
  # in $_FILES, one with tmp_name and the other without.
  # All other variables (name, size, etc) are registered with magic_quotes_gpc
  # untouched, both in $_FILES and $GLOBALS and I did not found a reason for
  # disabling it for tmp_name.
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.9.2.5&r2=1.173.2.1.2.9.2.6&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.9.2.5 
php-src/main/rfc1867.c:1.173.2.1.2.9.2.6
--- php-src/main/rfc1867.c:1.173.2.1.2.9.2.5Tue Sep 23 15:18:26 2008
+++ php-src/main/rfc1867.c  Mon Oct 20 17:09:10 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.5 2008/09/23 15:18:26 nlopess Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.6 2008/10/20 17:09:10 lbarnaud Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1283,8 +1283,6 @@
/* Initialize variables */
add_protected_variable(param TSRMLS_CC);
 
-   magic_quotes_gpc = PG(magic_quotes_gpc);
-   PG(magic_quotes_gpc) = 0;
/* if param is of form xxx[.*] this will cut it to xxx 
*/
if (!is_anonymous) {
safe_php_register_variable(param, 
temp_filename, strlen(temp_filename), NULL, 1 TSRMLS_CC);
@@ -1299,8 +1297,6 @@
add_protected_variable(lbuf TSRMLS_CC);
register_http_post_files_variable(lbuf, temp_filename, 
http_post_files, 1 TSRMLS_CC);
 
-   PG(magic_quotes_gpc) = magic_quotes_gpc;
-
{
zval file_size, error_type;
 

http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313.phpt?view=markup&rev=1.1
Index: php-src/tests/basic/bug46313.phpt
+++ php-src/tests/basic/bug46313.phpt

http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313-win.phpt?view=markup&rev=1.1
Index: php-src/tests/basic/bug46313-win.phpt
+++ php-src/tests/basic/bug46313-win.phpt



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

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

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudMon Oct 20 18:42:58 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   rfc1867.c 
  Log:
  Better fix for #46313
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.9.2.6&r2=1.173.2.1.2.9.2.7&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.9.2.6 
php-src/main/rfc1867.c:1.173.2.1.2.9.2.7
--- php-src/main/rfc1867.c:1.173.2.1.2.9.2.6Mon Oct 20 17:09:10 2008
+++ php-src/main/rfc1867.c  Mon Oct 20 18:42:58 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.6 2008/10/20 17:09:10 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.7 2008/10/20 18:42:58 lbarnaud Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -789,7 +789,6 @@
int str_len = 0, num_vars = 0, num_vars_max = 2*10, *len_list = NULL;
char **val_list = NULL;
 #endif
-   zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
int fd=-1;
@@ -1280,12 +1279,18 @@
}
s = "";
 
+   {
+   /* store temp_filename as-is (without 
magic_quotes_gpc-ing it, in case upload_tmp_dir
+* contains escapeable characters. escape only the 
variable name.) */
+   zval zfilename;
+
/* Initialize variables */
add_protected_variable(param TSRMLS_CC);
 
/* if param is of form xxx[.*] this will cut it to xxx 
*/
if (!is_anonymous) {
-   safe_php_register_variable(param, 
temp_filename, strlen(temp_filename), NULL, 1 TSRMLS_CC);
+   ZVAL_STRING(&zfilename, temp_filename, 1);
+   safe_php_register_variable_ex(param, 
&zfilename, NULL, 1 TSRMLS_CC);
}

/* Add $foo[tmp_name] */
@@ -1295,7 +1300,9 @@
snprintf(lbuf, llen, "%s[tmp_name]", param);
}
add_protected_variable(lbuf TSRMLS_CC);
-   register_http_post_files_variable(lbuf, temp_filename, 
http_post_files, 1 TSRMLS_CC);
+   ZVAL_STRING(&zfilename, temp_filename, 1);
+   register_http_post_files_variable_ex(lbuf, &zfilename, 
http_post_files, 1 TSRMLS_CC);
+   }
 
{
zval file_size, error_type;



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

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

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudMon Oct 20 18:43:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   rfc1867.c 
  Log:
  WS
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.9.2.7&r2=1.173.2.1.2.9.2.8&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.9.2.7 
php-src/main/rfc1867.c:1.173.2.1.2.9.2.8
--- php-src/main/rfc1867.c:1.173.2.1.2.9.2.7Mon Oct 20 18:42:58 2008
+++ php-src/main/rfc1867.c  Mon Oct 20 18:43:32 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.7 2008/10/20 18:42:58 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.9.2.8 2008/10/20 18:43:32 lbarnaud Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -1280,28 +1280,28 @@
s = "";
 
{
-   /* store temp_filename as-is (without 
magic_quotes_gpc-ing it, in case upload_tmp_dir
-* contains escapeable characters. escape only the 
variable name.) */
-   zval zfilename;
+   /* store temp_filename as-is (without 
magic_quotes_gpc-ing it, in case upload_tmp_dir
+* contains escapeable characters. escape only 
the variable name.) */
+   zval zfilename;
 
-   /* Initialize variables */
-   add_protected_variable(param TSRMLS_CC);
+   /* Initialize variables */
+   add_protected_variable(param TSRMLS_CC);
 
-   /* if param is of form xxx[.*] this will cut it to xxx 
*/
-   if (!is_anonymous) {
+   /* if param is of form xxx[.*] this will cut it 
to xxx */
+   if (!is_anonymous) {
+   ZVAL_STRING(&zfilename, temp_filename, 
1);
+   safe_php_register_variable_ex(param, 
&zfilename, NULL, 1 TSRMLS_CC);
+   }
+   
+   /* Add $foo[tmp_name] */
+   if (is_arr_upload) {
+   snprintf(lbuf, llen, 
"%s[tmp_name][%s]", abuf, array_index);
+   } else {
+   snprintf(lbuf, llen, "%s[tmp_name]", 
param);
+   }
+   add_protected_variable(lbuf TSRMLS_CC);
ZVAL_STRING(&zfilename, temp_filename, 1);
-   safe_php_register_variable_ex(param, 
&zfilename, NULL, 1 TSRMLS_CC);
-   }
-   
-   /* Add $foo[tmp_name] */
-   if (is_arr_upload) {
-   snprintf(lbuf, llen, "%s[tmp_name][%s]", abuf, 
array_index);
-   } else {
-   snprintf(lbuf, llen, "%s[tmp_name]", param);
-   }
-   add_protected_variable(lbuf TSRMLS_CC);
-   ZVAL_STRING(&zfilename, temp_filename, 1);
-   register_http_post_files_variable_ex(lbuf, &zfilename, 
http_post_files, 1 TSRMLS_CC);
+   register_http_post_files_variable_ex(lbuf, 
&zfilename, http_post_files, 1 TSRMLS_CC);
}
 
{



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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c /tests/basic bug46313-win.phpt bug46313.phpt

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudMon Oct 20 18:45:24 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/tests/basicbug46313-win.phpt bug46313.phpt 

  Modified files:  
/php-src/main   rfc1867.c 
/php-srcNEWS 
  Log:
  MFB PHP_5_3: Fixed #46313 (Magic quotes broke $_FILES)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.13&r2=1.173.2.1.2.14&diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.13 
php-src/main/rfc1867.c:1.173.2.1.2.14
--- php-src/main/rfc1867.c:1.173.2.1.2.13   Sun Sep  7 14:18:11 2008
+++ php-src/main/rfc1867.c  Mon Oct 20 18:45:23 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: rfc1867.c,v 1.173.2.1.2.13 2008/09/07 14:18:11 lbarnaud Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.14 2008/10/20 18:45:23 lbarnaud Exp $ */
 
 /*
  *  This product includes software developed by the Apache Group
@@ -788,7 +788,6 @@
int str_len = 0, num_vars = 0, num_vars_max = 2*10, *len_list = NULL;
char **val_list = NULL;
 #endif
-   zend_bool magic_quotes_gpc;
multipart_buffer *mbuff;
zval *array_ptr = (zval *) arg;
int fd=-1;
@@ -1279,26 +1278,30 @@
}
s = "";
 
-   /* Initialize variables */
-   add_protected_variable(param TSRMLS_CC);
+   {
+   /* store temp_filename as-is (without 
magic_quotes_gpc-ing it, in case upload_tmp_dir
+* contains escapeable characters. escape only 
the variable name.) */
+   zval zfilename;
 
-   magic_quotes_gpc = PG(magic_quotes_gpc);
-   PG(magic_quotes_gpc) = 0;
-   /* if param is of form xxx[.*] this will cut it to xxx 
*/
-   if (!is_anonymous) {
-   safe_php_register_variable(param, 
temp_filename, strlen(temp_filename), NULL, 1 TSRMLS_CC);
-   }
-   
-   /* Add $foo[tmp_name] */
-   if (is_arr_upload) {
-   snprintf(lbuf, llen, "%s[tmp_name][%s]", abuf, 
array_index);
-   } else {
-   snprintf(lbuf, llen, "%s[tmp_name]", param);
-   }
-   add_protected_variable(lbuf TSRMLS_CC);
-   register_http_post_files_variable(lbuf, temp_filename, 
http_post_files, 1 TSRMLS_CC);
+   /* Initialize variables */
+   add_protected_variable(param TSRMLS_CC);
 
-   PG(magic_quotes_gpc) = magic_quotes_gpc;
+   /* if param is of form xxx[.*] this will cut it 
to xxx */
+   if (!is_anonymous) {
+   ZVAL_STRING(&zfilename, temp_filename, 
1);
+   safe_php_register_variable_ex(param, 
&zfilename, NULL, 1 TSRMLS_CC);
+   }
+   
+   /* Add $foo[tmp_name] */
+   if (is_arr_upload) {
+   snprintf(lbuf, llen, 
"%s[tmp_name][%s]", abuf, array_index);
+   } else {
+   snprintf(lbuf, llen, "%s[tmp_name]", 
param);
+   }
+   add_protected_variable(lbuf TSRMLS_CC);
+   ZVAL_STRING(&zfilename, temp_filename, 1);
+   register_http_post_files_variable_ex(lbuf, 
&zfilename, http_post_files, 1 TSRMLS_CC);
+   }
 
{
zval file_size, error_type;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1265&r2=1.2027.2.547.2.1266&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1265 php-src/NEWS:1.2027.2.547.2.1266
--- php-src/NEWS:1.2027.2.547.2.1265Mon Oct 20 12:46:57 2008
+++ php-src/NEWSMon Oct 20 18:45:23 2008
@@ -7,6 +7,7 @@
   (Rob)
 - Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
   response code, in cgi sapi). (Ilia)
+- Fixed bug #46313 (Magic quotes broke $_FILES). (Arnaud)
 - Fixed bug #46308 (Invalid write when changing property from inside getter).
   (Dmitry)
 - Fixed bug #46292 (PDO::setFetchMode() shouldn't requires the 2nd arg when 

http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313-win.phpt?view=markup&rev=1.1
Index: php-src/tests/basic/bug46313-win.phpt
+++ php-src/tests/basic/bug46313-win.phpt

http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313.phpt?view=markup&rev=1.1
Index: php-src/tests/basic/bug46313.phpt
+++ php-src/tests/

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

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 19:28:36 2008 UTC

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  fix bug #46323 (compilation of simplexml for NetWare breaks)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.262&r2=1.263&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.262 
php-src/ext/simplexml/simplexml.c:1.263
--- php-src/ext/simplexml/simplexml.c:1.262 Thu Oct 16 11:42:20 2008
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 20 19:28:36 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.262 2008/10/16 11:42:20 indeyets Exp $ */
+/* $Id: simplexml.c,v 1.263 2008/10/20 19:28:36 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1291,7 +1291,7 @@
if (nodeptr->type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? nodeptr->ns->href : 
NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar 
*)nodeptr->ns->href : NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2644,7 +2644,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.262 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.263 $");
php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
"enabled");



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

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

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 19:29:04 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #46323 (compilation of simplexml for NetWare breaks)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.21&r2=1.151.2.22.2.35.2.22&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.22
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21  Thu Oct 16 
11:38:25 2008
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 20 19:29:04 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.21 2008/10/16 11:38:25 indeyets Exp $ 
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.22 2008/10/20 19:29:04 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1274,7 +1274,7 @@
if (nodeptr->type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? nodeptr->ns->href : 
NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar 
*)nodeptr->ns->href : NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2562,7 +2562,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 
1.151.2.22.2.35.2.21 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 
1.151.2.22.2.35.2.22 $");
php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
"enabled");



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

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

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 19:29:40 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #46323 (compilation of simplexml for NetWare breaks)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.44&r2=1.151.2.22.2.45&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.44 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.45
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.44   Thu Sep 11 14:23:33 2008
+++ php-src/ext/simplexml/simplexml.c   Mon Oct 20 19:29:40 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.44 2008/09/11 14:23:33 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.45 2008/10/20 19:29:40 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1233,7 +1233,7 @@
if (nodeptr->type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? nodeptr->ns->href : 
NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr->parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar 
*)nodeptr->ns->href : NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2450,7 +2450,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.44 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.45 $");
php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
"enabled");



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

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

2008-10-20 Thread Rob Richards 
rrichards   Mon Oct 20 19:30:56 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1266&r2=1.2027.2.547.2.1267&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1266 php-src/NEWS:1.2027.2.547.2.1267
--- php-src/NEWS:1.2027.2.547.2.1266Mon Oct 20 18:45:23 2008
+++ php-src/NEWSMon Oct 20 19:30:56 2008
@@ -5,6 +5,8 @@
   constants). (Ilia)
 - Fixed bug #46335 (DOMText::splitText doesn't handle multibyte characters).
   (Rob)
+- Fixed bug #46323 (compilation of simplexml for NetWare breaks). 
+  (Patch by [EMAIL PROTECTED])
 - Fixed bug #46319 (PHP sets default Content-Type header for HTTP 304
   response code, in cgi sapi). (Ilia)
 - Fixed bug #46313 (Magic quotes broke $_FILES). (Arnaud)



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

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

2008-10-20 Thread Ilia Alshanetsky 
iliaa   Mon Oct 20 23:22:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/filter logical_filters.c 
  Log:
  Fixed bug #46343 (IPv6 address filter accepts invalid address)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.22.2.2&r2=1.1.2.22.2.3&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.22.2.2 
php-src/ext/filter/logical_filters.c:1.1.2.22.2.3
--- php-src/ext/filter/logical_filters.c:1.1.2.22.2.2   Tue Mar 18 23:31:34 2008
+++ php-src/ext/filter/logical_filters.cMon Oct 20 23:22:45 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.22.2.2 2008/03/18 23:31:34 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.22.2.3 2008/10/20 23:22:45 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -529,6 +529,7 @@
char *ipv4;
char *end;
int ip4elm[4];
+   char *s = str;
 
if (!memchr(str, ':', str_len)) {
return 0;
@@ -568,6 +569,8 @@
return 1;
}
compressed = 1;
+   } else if ((str - 1) == s) {
+   return 0;
}   
}
n = 0;



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

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

2008-10-20 Thread Ilia Alshanetsky 
iliaa   Mon Oct 20 23:23:45 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/filter logical_filters.c 
/php-srcNEWS 
  Log:
  
  MFB:Fixed bug #46343 (IPv6 address filter accepts invalid address)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.24&r2=1.1.2.25&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.24 
php-src/ext/filter/logical_filters.c:1.1.2.25
--- php-src/ext/filter/logical_filters.c:1.1.2.24   Tue Mar 18 23:32:42 2008
+++ php-src/ext/filter/logical_filters.cMon Oct 20 23:23:45 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.1.2.24 2008/03/18 23:32:42 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.25 2008/10/20 23:23:45 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -529,6 +529,7 @@
char *ipv4;
char *end;
int ip4elm[4];
+   char *s = str;
 
if (!memchr(str, ':', str_len)) {
return 0;
@@ -568,6 +569,8 @@
return 1;
}
compressed = 1;
+   } else if ((str - 1) == s) {
+   return 0;
}   
}
n = 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1267&r2=1.2027.2.547.2.1268&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1267 php-src/NEWS:1.2027.2.547.2.1268
--- php-src/NEWS:1.2027.2.547.2.1267Mon Oct 20 19:30:56 2008
+++ php-src/NEWSMon Oct 20 23:23:45 2008
@@ -1,6 +1,7 @@
 PHPNEWS
 |||
 ?? Oct 2008, PHP 5.2.7RC2
+- Fixed bug #46343 (IPv6 address filter accepts invalid address). (Ilia)
 - Fixed bug #46341 (Added missing validation checks into define() for class
   constants). (Ilia)
 - Fixed bug #46335 (DOMText::splitText doesn't handle multibyte characters).



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

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

2008-10-20 Thread Ilia Alshanetsky 
iliaa   Mon Oct 20 23:23:53 2008 UTC

  Modified files:  
/php-src/ext/filter logical_filters.c 
  Log:
  
  MFB: Fixed bug #46343 (IPv6 address filter accepts invalid address)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.28 
php-src/ext/filter/logical_filters.c:1.29
--- php-src/ext/filter/logical_filters.c:1.28   Tue Mar 18 23:32:56 2008
+++ php-src/ext/filter/logical_filters.cMon Oct 20 23:23:53 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: logical_filters.c,v 1.28 2008/03/18 23:32:56 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.29 2008/10/20 23:23:53 iliaa Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -533,6 +533,7 @@
char *ipv4;
char *end;
int ip4elm[4];
+   char *s = str;
 
if (!memchr(str, ':', str_len)) {
return 0;
@@ -572,6 +573,8 @@
return 1;
}
compressed = 1;
+   } else if ((str - 1) == s) {
+   return 0;
}   
}
n = 0;



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

[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic apprentice.c

2008-10-20 Thread Scott MacVicar 
scottmacMon Oct 20 23:35:47 2008 UTC

  Modified files:  
/php-src/ext/fileinfo/libmagic  apprentice.c 
  Log:
  Fix bug #46331 - The internal magic db is const memory and segfaults when you 
try to do byte swapping
  on big endian machines. This fixes it by copying the memory for those 
processors, but this isn't ideal as
  it wastes memory. Perhaps using a static cache would be better.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.13 
php-src/ext/fileinfo/libmagic/apprentice.c:1.14
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.13 Wed Oct 15 22:57:22 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Mon Oct 20 23:35:47 2008
@@ -1913,6 +1913,16 @@
goto error1;
}
 
+   /* php_magic_database is a const, performing writes will segfault. This 
is for big-endian
+   machines only, PPC and Sparc specifically. Consider static variable or 
MINIT in
+   future. */
+   if (needsbyteswap && fn == NULL) {
+   mm = emalloc(sizeof(php_magic_database));
+   mm = memcpy(mm, php_magic_database, sizeof(php_magic_database));
+   *magicp = mm;
+   ret = 1;
+   }
+
if (fn == NULL) {
*nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
} else {



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

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

2008-10-20 Thread Scott MacVicar 
scottmacMon Oct 20 23:36:14 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic  apprentice.c 
  Log:
  MFH Fix bug #46331 - The internal magic db is const memory and segfaults when 
you try to do byte swapping
  on big endian machines. This fixes it by copying the memory for those 
processors, but this isn't ideal as  
  it wastes memory. Perhaps using a static cache would be better.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.7.2.8&r2=1.7.2.9&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.8 
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.9
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.8  Mon Oct 20 14:45:59 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Mon Oct 20 23:36:14 2008
@@ -1921,6 +1921,16 @@
goto error1;
}
 
+   /* php_magic_database is a const, performing writes will segfault. This 
is for big-endian
+   machines only, PPC and Sparc specifically. Consider static variable or 
MINIT in
+   future. */
+   if (needsbyteswap && fn == NULL) {
+   mm = emalloc(sizeof(php_magic_database));
+   mm = memcpy(mm, php_magic_database, sizeof(php_magic_database));
+   *magicp = mm;
+   ret = 1;
+   }
+
if (fn == NULL) {
*nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
} else {



-- 
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 fastcgi.c fastcgi.h

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudTue Oct 21 03:19:08 2008 UTC

  Modified files:  
/php-src/sapi/cgi   cgi_main.c fastcgi.c fastcgi.h 
  Log:
  Fixed FCGI_GET_VALUES requests (fixes #45522)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.366&r2=1.367&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.366 php-src/sapi/cgi/cgi_main.c:1.367
--- php-src/sapi/cgi/cgi_main.c:1.366   Fri Oct 17 01:34:26 2008
+++ php-src/sapi/cgi/cgi_main.c Tue Oct 21 03:19:07 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.366 2008/10/17 01:34:26 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.367 2008/10/21 03:19:07 lbarnaud Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1619,11 +1619,18 @@
 #ifndef PHP_WIN32
/* Pre-fork, if required */
if (getenv("PHP_FCGI_CHILDREN")) {
-   children = atoi(getenv("PHP_FCGI_CHILDREN"));
+   char * children_str = getenv("PHP_FCGI_CHILDREN");
+   children = atoi(children_str);
if (children < 0) {
fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
return FAILURE;
}
+   fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, 
children_str, strlen(children_str));
+   /* This is the number of concurrent requests, equals 
FCGI_MAX_CONNS */
+   fcgi_set_mgmt_var("FCGI_MAX_REQS",  sizeof("FCGI_MAX_REQS")-1,  
children_str, strlen(children_str));
+   } else {
+   fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, 
"1", sizeof("1")-1);
+   fcgi_set_mgmt_var("FCGI_MAX_REQS",  sizeof("FCGI_MAX_REQS")-1,  
"1", sizeof("1")-1);
}
 
if (children) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.48&r2=1.49&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.48 php-src/sapi/cgi/fastcgi.c:1.49
--- php-src/sapi/cgi/fastcgi.c:1.48 Tue Aug 26 09:56:22 2008
+++ php-src/sapi/cgi/fastcgi.c  Tue Oct 21 03:19:07 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.48 2008/08/26 09:56:22 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.49 2008/10/21 03:19:07 lbarnaud Exp $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -133,18 +133,7 @@
struct sockaddr_in  sa_inet;
 } sa_t;
 
-typedef struct _fcgi_mgmt_rec {
-   char*  name;
-   char   name_len;
-   char   val;
-} fcgi_mgmt_rec;
-
-static const fcgi_mgmt_rec fcgi_mgmt_vars[] = {
-   {"FCGI_MAX_CONNS",  sizeof("FCGI_MAX_CONNS")-1,  1},
-   {"FCGI_MAX_REQS",   sizeof("FCGI_MAX_REQS")-1,   1},
-   {"FCGI_MPXS_CONNS", sizeof("FCGI_MPXS_CONNS")-1, 0}
-};
-
+static HashTable fcgi_mgmt_vars;
 
 static int is_initialized = 0;
 static int is_fastcgi = 0;
@@ -193,12 +182,17 @@
 
 void fcgi_shutdown(void)
 {
+   if (is_initialized) {
+   zend_hash_destroy(&fcgi_mgmt_vars);
+   }
is_fastcgi = 0;
 }
 
 int fcgi_init(void)
 {
if (!is_initialized) {
+   zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb, 
1);
+   fcgi_set_mgmt_var("FCGI_MPXS_CONNS", 
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
 #ifdef _WIN32
 # if 0
/* TODO: Support for TCP sockets */
@@ -750,8 +744,13 @@
padding = hdr.paddingLength;
}
} else if (hdr.type == FCGI_GET_VALUES) {
-   int j;
unsigned char *p = buf + sizeof(fcgi_header);
+   HashPosition pos;
+   char * str_index;
+   uint str_length;
+   ulong num_index;
+   int key_type;
+   zval ** value;
 
if (safe_read(req, buf, len+padding) != len+padding) {
req->keep = 0;
@@ -763,11 +762,41 @@
return 0;
}
 
-   for (j = 0; j < 
sizeof(fcgi_mgmt_vars)/sizeof(fcgi_mgmt_vars[0]); j++) {
-   if (zend_hash_exists(req->env, fcgi_mgmt_vars[j].name, 
fcgi_mgmt_vars[j].name_len+1) == 0) {
-sprintf((char*)p, "%c%c%s%c", fcgi_mgmt_vars[j].name_len, 1, 
fcgi_mgmt_vars[j].name, fcgi_mgmt_vars[j].val);
-p += fcgi_mgmt_vars[j].name_len + 3;
+   zend_hash_internal_pointer_reset_ex(req->env, &pos);
+   while ((key_type = zend_hash_get_current_key_ex(req->env, 
&str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
+   int zlen;
+   zend_hash_move_forward_ex(req->env, &pos);
+   if (key_type != HASH_KEY_IS_STRING) {
+   continue;
+   }
+   if (zend_hash_find(&fcgi_mgmt_vars, str_index, 
str_length, (void**) &value)

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /sapi/cgi cgi_main.c fastcgi.c fastcgi.h

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudTue Oct 21 03:19:28 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/sapi/cgi   cgi_main.c fastcgi.c fastcgi.h 
  Log:
  MFH: Fixed FCGI_GET_VALUES requests (fixes #45522)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.345&r2=1.2027.2.547.2.965.2.346&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.345 
php-src/NEWS:1.2027.2.547.2.965.2.346
--- php-src/NEWS:1.2027.2.547.2.965.2.345   Wed Oct 15 18:41:57 2008
+++ php-src/NEWSTue Oct 21 03:19:28 2008
@@ -48,6 +48,8 @@
   (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
 - Fixed bug #45907 (undefined reference to 'PHP_SHA512Init'). (Greg)
+- Fixed buf #45522 (FCGI_GET_VALUES request does not return supplied values).
+  (Arnaud)
 - Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
 - Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).
   (vnegrier at optilian dot com, Ilia)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.29&r2=1.267.2.15.2.50.2.30&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.29 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.30
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.29Fri Oct 17 01:31:12 2008
+++ php-src/sapi/cgi/cgi_main.c Tue Oct 21 03:19:28 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.29 2008/10/17 01:31:12 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.30 2008/10/21 03:19:28 lbarnaud Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1608,11 +1608,18 @@
 #ifndef PHP_WIN32
/* Pre-fork, if required */
if (getenv("PHP_FCGI_CHILDREN")) {
-   children = atoi(getenv("PHP_FCGI_CHILDREN"));
+   char * children_str = getenv("PHP_FCGI_CHILDREN");
+   children = atoi(children_str);
if (children < 0) {
fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
return FAILURE;
}
+   fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, 
children_str, strlen(children_str));
+   /* This is the number of concurrent requests, equals 
FCGI_MAX_CONNS */
+   fcgi_set_mgmt_var("FCGI_MAX_REQS",  sizeof("FCGI_MAX_REQS")-1,  
children_str, strlen(children_str));
+   } else {
+   fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, 
"1", sizeof("1")-1);
+   fcgi_set_mgmt_var("FCGI_MAX_REQS",  sizeof("FCGI_MAX_REQS")-1,  
"1", sizeof("1")-1);
}
 
if (children) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.28.2.6&r2=1.4.2.13.2.28.2.7&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.6 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.7
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.28.2.6Tue Aug 26 09:56:08 2008
+++ php-src/sapi/cgi/fastcgi.c  Tue Oct 21 03:19:28 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.28.2.6 2008/08/26 09:56:08 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.28.2.7 2008/10/21 03:19:28 lbarnaud Exp $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -133,18 +133,7 @@
struct sockaddr_in  sa_inet;
 } sa_t;
 
-typedef struct _fcgi_mgmt_rec {
-   char*  name;
-   char   name_len;
-   char   val;
-} fcgi_mgmt_rec;
-
-static const fcgi_mgmt_rec fcgi_mgmt_vars[] = {
-   {"FCGI_MAX_CONNS",  sizeof("FCGI_MAX_CONNS")-1,  1},
-   {"FCGI_MAX_REQS",   sizeof("FCGI_MAX_REQS")-1,   1},
-   {"FCGI_MPXS_CONNS", sizeof("FCGI_MPXS_CONNS")-1, 0}
-};
-
+static HashTable fcgi_mgmt_vars;
 
 static int is_initialized = 0;
 static int is_fastcgi = 0;
@@ -194,6 +183,8 @@
 int fcgi_init(void)
 {
if (!is_initialized) {
+   zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb, 
1);
+   fcgi_set_mgmt_var("FCGI_MPXS_CONNS", 
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
 #ifdef _WIN32
 # if 0
/* TODO: Support for TCP sockets */
@@ -260,6 +251,9 @@
 
 void fcgi_shutdown(void)
 {
+   if (is_initialized) {
+   zend_hash_destroy(&fcgi_mgmt_vars);
+   }
is_fastcgi = 0;
 }
 
@@ -750,8 +744,13 @@
padding = hdr.paddingLength;
}
} else if (hdr.type == FCGI_GET_VALUES) {
-   int j;
unsigned char *p = buf + sizeof(fcgi_header);
+   HashPosition pos;
+   char * str_index;
+   uint str_length;
+   ulong num_index;
+   int key_type;
+   zval ** value;
 
if (safe_read(req, buf, len+padding) != len+padding) {

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

2008-10-20 Thread Arnaud Le Blanc 
lbarnaudTue Oct 21 03:32:12 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.346&r2=1.2027.2.547.2.965.2.347&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.346 
php-src/NEWS:1.2027.2.547.2.965.2.347
--- php-src/NEWS:1.2027.2.547.2.965.2.346   Tue Oct 21 03:19:28 2008
+++ php-src/NEWSTue Oct 21 03:32:11 2008
@@ -48,7 +48,7 @@
   (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
 - Fixed bug #45907 (undefined reference to 'PHP_SHA512Init'). (Greg)
-- Fixed buf #45522 (FCGI_GET_VALUES request does not return supplied values).
+- Fixed bug #45522 (FCGI_GET_VALUES request does not return supplied values).
   (Arnaud)
 - Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Ilia)
 - Fixed bug #45382 (timeout bug in stream_socket_enable_crypto).



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