[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/bug46614.phpt trunk/ext/mysqli/tests/bug46614.phpt
uw Thu, 24 Sep 2009 09:40:24 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288644
Log:
Fixing test
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug46614.phpt
U php/php-src/trunk/ext/mysqli/tests/bug46614.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug46614.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug46614.phpt 2009-09-24
09:33:35 UTC (rev 288643)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug46614.phpt 2009-09-24
09:40:24 UTC (rev 288644)
@@ -12,7 +12,7 @@
?php
class MySQL_Ext extends mysqli{
protected $fooData = array();
-
+
public function isEmpty()
{
$this-extData[] = 'Bar';
@@ -20,13 +20,11 @@
}
}
+include (connect.inc);
+$MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db, $port, $socket);
-
- include (connect.inc);
- $MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db);
-
- $isEmpty = $MySQL_Ext-isEmpty();
- var_dump($isEmpty);
+$isEmpty = $MySQL_Ext-isEmpty();
+var_dump($isEmpty);
?
--EXPECT--
bool(false)
Modified: php/php-src/trunk/ext/mysqli/tests/bug46614.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/bug46614.phpt2009-09-24 09:33:35 UTC
(rev 288643)
+++ php/php-src/trunk/ext/mysqli/tests/bug46614.phpt2009-09-24 09:40:24 UTC
(rev 288644)
@@ -12,7 +12,7 @@
?php
class MySQL_Ext extends mysqli{
protected $fooData = array();
-
+
public function isEmpty()
{
$this-extData[] = 'Bar';
@@ -20,13 +20,11 @@
}
}
+include (connect.inc);
+$MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db, $port, $socket);
-
- include (connect.inc);
- $MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db);
-
- $isEmpty = $MySQL_Ext-isEmpty();
- var_dump($isEmpty);
+$isEmpty = $MySQL_Ext-isEmpty();
+var_dump($isEmpty);
?
--EXPECT--
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/configure.in trunk/configure.in
tony2001 Thu, 24 Sep 2009 10:43:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288649 Log: save LDFLAGS in EXTRA_LDFLAGS before unsetting this patch makes sure that LDFLAGS are taken into account when configuring the build Changed paths: U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:43:13 UTC (rev 288649) @@ -994,6 +994,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/trunk/configure.in 2009-09-24 10:43:13 UTC (rev 288649) @@ -983,6 +983,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/configure.in trunk/configure.in
Ilia, let me know if you want this merged into 5_2. Jani thinks it should be ok, but I prefer to hear from you first. On 24.09.2009 14:43, Antony Dovgal wrote: tony2001 Thu, 24 Sep 2009 10:43:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288649 Log: save LDFLAGS in EXTRA_LDFLAGS before unsetting this patch makes sure that LDFLAGS are taken into account when configuring the build Changed paths: U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:43:13 UTC (rev 288649) @@ -994,6 +994,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/trunk/configure.in2009-09-24 10:43:13 UTC (rev 288649) @@ -983,6 +983,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). -- Wbr, Antony Dovgal --- http://pinba.org - realtime statistics for PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/dom/documenttype.c branches/PHP_5_3/ext/dom/documenttype.c trunk/ext/dom/documenttype.c
rrichardsThu, 24 Sep 2009 12:40:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288652
Log:
fix memleak
Changed paths:
U php/php-src/branches/PHP_5_2/ext/dom/documenttype.c
U php/php-src/branches/PHP_5_3/ext/dom/documenttype.c
U php/php-src/trunk/ext/dom/documenttype.c
Modified: php/php-src/branches/PHP_5_2/ext/dom/documenttype.c
===
--- php/php-src/branches/PHP_5_2/ext/dom/documenttype.c 2009-09-24 11:04:52 UTC
(rev 288651)
+++ php/php-src/branches/PHP_5_2/ext/dom/documenttype.c 2009-09-24 12:40:59 UTC
(rev 288652)
@@ -200,7 +200,6 @@
xmlDtdPtr dtdptr;
xmlDtd *intsubset;
xmlOutputBuffer *buff = NULL;
- xmlChar *strintsubset;
dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
@@ -216,9 +215,8 @@
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset,
0, 0, NULL);
xmlOutputBufferFlush(buff);
- strintsubset = xmlStrndup(buff-buffer-content,
buff-buffer-use);
+ ZVAL_STRINGL(*retval, buff-buffer-content,
buff-buffer-use, 1);
(void)xmlOutputBufferClose(buff);
- ZVAL_STRING(*retval, (char *) strintsubset, 1);
return SUCCESS;
}
}
Modified: php/php-src/branches/PHP_5_3/ext/dom/documenttype.c
===
--- php/php-src/branches/PHP_5_3/ext/dom/documenttype.c 2009-09-24 11:04:52 UTC
(rev 288651)
+++ php/php-src/branches/PHP_5_3/ext/dom/documenttype.c 2009-09-24 12:40:59 UTC
(rev 288652)
@@ -190,7 +190,6 @@
xmlDtdPtr dtdptr;
xmlDtd *intsubset;
xmlOutputBuffer *buff = NULL;
- xmlChar *strintsubset;
dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
@@ -206,9 +205,8 @@
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset,
0, 0, NULL);
xmlOutputBufferFlush(buff);
- strintsubset = xmlStrndup(buff-buffer-content,
buff-buffer-use);
+ ZVAL_STRINGL(*retval, buff-buffer-content,
buff-buffer-use, 1);
(void)xmlOutputBufferClose(buff);
- ZVAL_STRING(*retval, (char *) strintsubset, 1);
return SUCCESS;
}
}
Modified: php/php-src/trunk/ext/dom/documenttype.c
===
--- php/php-src/trunk/ext/dom/documenttype.c2009-09-24 11:04:52 UTC (rev
288651)
+++ php/php-src/trunk/ext/dom/documenttype.c2009-09-24 12:40:59 UTC (rev
288652)
@@ -190,7 +190,6 @@
xmlDtdPtr dtdptr;
xmlDtd *intsubset;
xmlOutputBuffer *buff = NULL;
- xmlChar *strintsubset;
dtdptr = (xmlDtdPtr) dom_object_get_node(obj);
@@ -206,9 +205,8 @@
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset,
0, 0, NULL);
xmlOutputBufferFlush(buff);
- strintsubset = xmlStrndup(buff-buffer-content,
buff-buffer-use);
+ ZVAL_STRINGL(*retval, buff-buffer-content,
buff-buffer-use, 1);
(void)xmlOutputBufferClose(buff);
- ZVAL_STRING(*retval, (char *) strintsubset, 1);
return SUCCESS;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/001.phpt branches/PHP_5_3/ext/mysqli/tests/002.phpt branches/PHP_5_3/ext/mysqli/tests/003.phpt branches/PHP_5_3/ext/mysqli/tests/004.phpt
uw Thu, 24 Sep 2009 12:51:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288653 Log: Proxying as many connect calls as possible to make testing of the compression protocol @ mysqlnd easier. By setting the environment variable MYSQL_TEST_COMPRESS you can tell the tests to set the MYSQLI_CLIENT_COMPRESS flag upon connect. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/001.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/002.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/003.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/005.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/006.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/007.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/008.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/009.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/010.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/011.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/012.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/013.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/014.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/016.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/017.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/018.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/019.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/020.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/021.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/022.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/023.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/024.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/025.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/026.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/027.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/028.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/029.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/030.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/031.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/032.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/033.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/034.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/035.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/036.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/037.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/038.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/039.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/040.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/041.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/042.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/043.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/044.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/045.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/046.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/047.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/048.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/049.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/050.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/051.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/052.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/053.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/054.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/055.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/057.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/058.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/059.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/060.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/062.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/063.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/064.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/065.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/066.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/067.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/069.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/070.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/071.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/072.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/074.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug31668.phpt U
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/dom/node.c trunk/ext/dom/node.c
rrichardsThu, 24 Sep 2009 13:18:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288654
Log:
Fixed bug #49647 (DOMUserData does not exist)
Bug: http://bugs.php.net/49647 (Open) DOMUserData does not exist
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/dom/node.c
U php/php-src/trunk/ext/dom/node.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-09-24 12:51:03 UTC (rev 288653)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-09-24 13:18:22 UTC (rev 288654)
@@ -6,6 +6,7 @@
- Implemented FR #49253 (added support for libcurl's CERTINFO option).
(Linus Nielsen Feltzing li...@haxx.se)
+- Fixed bug #49647 (DOMUserData does not exist). (Rob)
- Fixed bug #49630 (imap_listscan function missing). (Felipe)
- Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning CURLPROTO_FILE
cannot be set). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/dom/node.c
===
--- php/php-src/branches/PHP_5_3/ext/dom/node.c 2009-09-24 12:51:03 UTC (rev
288653)
+++ php/php-src/branches/PHP_5_3/ext/dom/node.c 2009-09-24 13:18:22 UTC (rev
288654)
@@ -1730,7 +1730,7 @@
}
/* }}} end dom_node_get_feature */
-/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data,
userdatahandler handler);
+/* {{{ proto mixed dom_node_set_user_data(string key, mixed data,
userdatahandler handler);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
Since: DOM Level 3
*/
@@ -1740,7 +1740,7 @@
}
/* }}} end dom_node_set_user_data */
-/* {{{ proto DomUserData dom_node_get_user_data(string key);
+/* {{{ proto mixed dom_node_get_user_data(string key);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
Since: DOM Level 3
*/
Modified: php/php-src/trunk/ext/dom/node.c
===
--- php/php-src/trunk/ext/dom/node.c2009-09-24 12:51:03 UTC (rev 288653)
+++ php/php-src/trunk/ext/dom/node.c2009-09-24 13:18:22 UTC (rev 288654)
@@ -1732,7 +1732,7 @@
}
/* }}} end dom_node_get_feature */
-/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data,
userdatahandler handler) U
+/* {{{ proto mixed dom_node_set_user_data(string key, mixed data,
userdatahandler handler) U
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
Since: DOM Level 3
*/
@@ -1742,7 +1742,7 @@
}
/* }}} end dom_node_set_user_data */
-/* {{{ proto DomUserData dom_node_get_user_data(string key) U
+/* {{{ proto mixed dom_node_get_user_data(string key) U
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
Since: DOM Level 3
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS ext/dom/node.c
rrichardsThu, 24 Sep 2009 15:10:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288658
Log:
MFH: Fixed bug #49647 (DOMUserData does not exist)
Bug: http://bugs.php.net/49647 (Closed) DOMUserData does not exist
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/dom/node.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2009-09-24 14:56:28 UTC (rev 288657)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-09-24 15:10:21 UTC (rev 288658)
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? , PHP 5.2.12
+- Fixed bug #49647 (DOMUserData does not exist). (Rob)
- Fixed bug #49630 (imap_listscan function missing). (Felipe)
- Fixed bug #49578 (make install-pear fails). (Hannes)
- Fixed bug #49536 (mb_detect_encoding() returns incorrect results when
Modified: php/php-src/branches/PHP_5_2/ext/dom/node.c
===
--- php/php-src/branches/PHP_5_2/ext/dom/node.c 2009-09-24 14:56:28 UTC (rev
288657)
+++ php/php-src/branches/PHP_5_2/ext/dom/node.c 2009-09-24 15:10:21 UTC (rev
288658)
@@ -1778,7 +1778,7 @@
/* }}} end dom_node_get_feature */
-/* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data,
userdatahandler handler);
+/* {{{ proto mixed dom_node_set_user_data(string key, mixed data,
userdatahandler handler);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData
Since: DOM Level 3
*/
@@ -1789,7 +1789,7 @@
/* }}} end dom_node_set_user_data */
-/* {{{ proto DomUserData dom_node_get_user_data(string key);
+/* {{{ proto mixed dom_node_get_user_data(string key);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData
Since: DOM Level 3
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/configure.in trunk/configure.in
Go ahead, looks like a good fix. On 2009-09-24, at 6:50 AM, Antony Dovgal wrote: Ilia, let me know if you want this merged into 5_2. Jani thinks it should be ok, but I prefer to hear from you first. On 24.09.2009 14:43, Antony Dovgal wrote: tony2001 Thu, 24 Sep 2009 10:43:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288649 Log: save LDFLAGS in EXTRA_LDFLAGS before unsetting this patch makes sure that LDFLAGS are taken into account when configuring the build Changed paths: U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/branches/PHP_5_3/configure.in 2009-09-24 10:43:13 UTC (rev 288649) @@ -994,6 +994,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-09-24 10:29:22 UTC (rev 288648) +++ php/php-src/trunk/configure.in 2009-09-24 10:43:13 UTC (rev 288649) @@ -983,6 +983,7 @@ esac EXTRA_LIBS=$EXTRA_LIBS $DLIBS $LIBS +EXTRA_LDFLAGS=$EXTRA_LDFLAGS $LDFLAGS dnl this has to be here to prevent the openssl crypt() from dnl overriding the system provided crypt(). -- Wbr, Antony Dovgal --- http://pinba.org - realtime statistics for PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/config9.m4 branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h trunk/ext/mysqlnd/config9.m4 trunk/ext/mysqlnd/mysqlnd_portability.h
jani Thu, 24 Sep 2009 18:01:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288676 Log: - Fix the build issue with php_mysqlnd_config.h ending up in wrong build directory Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h U php/php-src/trunk/ext/mysqlnd/config9.m4 U php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-09-24 17:54:23 UTC (rev 288675) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2009-09-24 18:01:17 UTC (rev 288676) @@ -2,7 +2,6 @@ dnl $Id$ dnl config.m4 for mysqlnd driver - PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd, [ --enable-mysqlnd-threading EXPERIMENTAL: Enable mysqlnd threaded fetch. @@ -24,14 +23,14 @@ PHP_BUILD_THREAD_SAFE AC_DEFINE([MYSQLND_THREADED], 1, [Use mysqlnd internal threading]) fi - fi - PHP_INSTALL_HEADERS([ext/mysqlnd]) - PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h]) +if test $PHP_MYSQLND_ENABLED = yes || test $PHP_MYSQLI != no; then + PHP_ADD_BUILD_DIR([ext/mysqlnd], 1) + dnl This creates a file so it has to be after above macros PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [ -$ext_builddir/php_mysqlnd_config.h +ext/mysqlnd/php_mysqlnd_config.h ],[ #ifdef HAVE_SYS_TYPES_H #include sys/types.h @@ -40,3 +39,4 @@ #include stdint.h #endif ]) +fi Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 17:54:23 UTC (rev 288675) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 18:01:17 UTC (rev 288676) @@ -33,9 +33,9 @@ #endif /* __CYGWIN__ */ #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) -# include ext/mysqlnd/config-win.h +# include ext/mysqlnd/config-win.h #else -# include ext/mysqlnd/php_mysqlnd_config.h +# include ext/mysqlnd/php_mysqlnd_config.h #endif /* _WIN32... */ #ifdef HAVE_SYS_TYPES_H Modified: php/php-src/trunk/ext/mysqlnd/config9.m4 === --- php/php-src/trunk/ext/mysqlnd/config9.m42009-09-24 17:54:23 UTC (rev 288675) +++ php/php-src/trunk/ext/mysqlnd/config9.m42009-09-24 18:01:17 UTC (rev 288676) @@ -2,7 +2,6 @@ dnl $Id$ dnl config.m4 for mysqlnd driver - PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd, [ --enable-mysqlnd-threading EXPERIMENTAL: Enable mysqlnd threaded fetch. @@ -24,14 +23,14 @@ PHP_BUILD_THREAD_SAFE AC_DEFINE([MYSQLND_THREADED], 1, [Use mysqlnd internal threading]) fi - fi - PHP_INSTALL_HEADERS([ext/mysqlnd]) - PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h]) +if test $PHP_MYSQLND_ENABLED = yes || test $PHP_MYSQLI != no; then + PHP_ADD_BUILD_DIR([ext/mysqlnd], 1) + dnl This creates a file so it has to be after above macros PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [ -$ext_builddir/php_mysqlnd_config.h +ext/mysqlnd/php_mysqlnd_config.h ],[ #ifdef HAVE_SYS_TYPES_H #include sys/types.h @@ -40,3 +39,4 @@ #include stdint.h #endif ]) +fi Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h === --- php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 17:54:23 UTC (rev 288675) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_portability.h 2009-09-24 18:01:17 UTC (rev 288676) @@ -33,9 +33,9 @@ #endif /* __CYGWIN__ */ #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) -# include ext/mysqlnd/config-win.h +# include ext/mysqlnd/config-win.h #else -# include ext/mysqlnd/php_mysqlnd_config.h +# include ext/mysqlnd/php_mysqlnd_config.h #endif /* _WIN32... */ #ifdef HAVE_SYS_TYPES_H -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c
srinatar Thu, 24 Sep 2009 18:20:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288677 Log: - Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). Bug: http://bugs.php.net/49571 (Feedback) CURLOPT_POSTREDIR not implemented Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/curl/interface.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/curl/interface.c U php/php-src/trunk/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:20:49 UTC (rev 288677) @@ -12,6 +12,8 @@ of a multibyte character). (Moriyoshi) - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted). (Moriyoshi) +- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). + (Sriram Natarajan) 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c === --- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -649,6 +649,10 @@ REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL); #endif +#if LIBCURL_VERSION_NUM 0x071301 + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); +#endif + #if LIBCURL_VERSION_NUM = 0x071304 REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS); REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS); @@ -1381,6 +1385,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; +#if LIBCURL_VERSION_NUM 0x071301 + case CURLOPT_POSTREDIR: + convert_to_long_ex(zvalue); + error = curl_easy_setopt(ch-cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) CURL_REDIR_POST_ALL); + break; +#endif case CURLOPT_PRIVATE: case CURLOPT_URL: case CURLOPT_PROXY: Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-24 18:20:49 UTC (rev 288677) @@ -10,6 +10,8 @@ - Fixed bug #49630 (imap_listscan function missing). (Felipe) - Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning CURLPROTO_FILE cannot be set). (Felipe) +- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). + (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1RC? - WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c === --- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -747,8 +747,10 @@ REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL); REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL); #endif + #if LIBCURL_VERSION_NUM 0x071301 REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO); + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); #endif /* SSH support works in 7.19.0+ using libssh2 */ @@ -1669,6 +1671,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; +#if LIBCURL_VERSION_NUM 0x071301 + case CURLOPT_POSTREDIR: + convert_to_long_ex(zvalue); + error = curl_easy_setopt(ch-cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) CURL_REDIR_POST_ALL); + break; +#endif case CURLOPT_PRIVATE: case CURLOPT_URL: case CURLOPT_PROXY: Modified: php/php-src/trunk/ext/curl/interface.c === --- php/php-src/trunk/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/trunk/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -767,6 +767,10 @@ REGISTER_CURL_CONSTANT(CURLE_SSH); #endif +#if LIBCURL_VERSION_NUM 0x071301 + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); +#endif + #if LIBCURL_VERSION_NUM = 0x071304 REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS); REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS); @@ -1685,6 +1689,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; +#if LIBCURL_VERSION_NUM 0x071301 + case
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/curl/interface.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c
That's more of a feature then a bug report no? If so, it does not belong in 5.2 On 2009-09-24, at 2:20 PM, Sriram Natarajan wrote: srinatar Thu, 24 Sep 2009 18:20:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288677 Log: - Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). Bug: http://bugs.php.net/49571 (Feedback) CURLOPT_POSTREDIR not implemented Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/curl/interface.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/curl/interface.c U php/php-src/trunk/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:20:49 UTC (rev 288677) @@ -12,6 +12,8 @@ of a multibyte character). (Moriyoshi) - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted). (Moriyoshi) +- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). + (Sriram Natarajan) 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c === --- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -649,6 +649,10 @@ REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL); #endif +#if LIBCURL_VERSION_NUM 0x071301 + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); +#endif + #if LIBCURL_VERSION_NUM = 0x071304 REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS); REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS); @@ -1381,6 +1385,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; +#if LIBCURL_VERSION_NUM 0x071301 + case CURLOPT_POSTREDIR: + convert_to_long_ex(zvalue); + error = curl_easy_setopt(ch-cp, CURLOPT_POSTREDIR, Z_LVAL_PP (zvalue) CURL_REDIR_POST_ALL); + break; +#endif case CURLOPT_PRIVATE: case CURLOPT_URL: case CURLOPT_PROXY: Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-24 18:20:49 UTC (rev 288677) @@ -10,6 +10,8 @@ - Fixed bug #49630 (imap_listscan function missing). (Felipe) - Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning CURLPROTO_FILE cannot be set). (Felipe) +- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). + (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1RC? - WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c === --- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -747,8 +747,10 @@ REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL); REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL); #endif + #if LIBCURL_VERSION_NUM 0x071301 REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO); + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); #endif /* SSH support works in 7.19.0+ using libssh2 */ @@ -1669,6 +1671,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; +#if LIBCURL_VERSION_NUM 0x071301 + case CURLOPT_POSTREDIR: + convert_to_long_ex(zvalue); + error = curl_easy_setopt(ch-cp, CURLOPT_POSTREDIR, Z_LVAL_PP (zvalue) CURL_REDIR_POST_ALL); + break; +#endif case CURLOPT_PRIVATE: case CURLOPT_URL: case CURLOPT_PROXY: Modified: php/php-src/trunk/ext/curl/interface.c === --- php/php-src/trunk/ext/curl/interface.c 2009-09-24 18:01:17 UTC (rev 288676) +++ php/php-src/trunk/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) @@ -767,6 +767,10 @@ REGISTER_CURL_CONSTANT(CURLE_SSH); #endif +#if LIBCURL_VERSION_NUM 0x071301 + REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); +#endif + #if LIBCURL_VERSION_NUM = 0x071304 REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS); REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS); @@ -1685,6 +1689,12 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue));
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS ext/curl/interface.c
srinatar Thu, 24 Sep 2009 18:45:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288678 Log: - Rollback fix for bug #49571 (CURLOPT_POSTREDIR not implemented). # - Features don't go into PHP 5.2 Bug: http://bugs.php.net/49571 (To be documented) CURLOPT_POSTREDIR not implemented Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/curl/interface.c Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:20:49 UTC (rev 288677) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-24 18:45:09 UTC (rev 288678) @@ -12,8 +12,6 @@ of a multibyte character). (Moriyoshi) - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted). (Moriyoshi) -- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). - (Sriram Natarajan) 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. Modified: php/php-src/branches/PHP_5_2/ext/curl/interface.c === --- php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:20:49 UTC (rev 288677) +++ php/php-src/branches/PHP_5_2/ext/curl/interface.c 2009-09-24 18:45:09 UTC (rev 288678) @@ -649,10 +649,6 @@ REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL); #endif -#if LIBCURL_VERSION_NUM 0x071301 - REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR); -#endif - #if LIBCURL_VERSION_NUM = 0x071304 REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS); REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS); @@ -1385,12 +1381,6 @@ } error = curl_easy_setopt(ch-cp, option, Z_LVAL_PP(zvalue)); break; -#if LIBCURL_VERSION_NUM 0x071301 - case CURLOPT_POSTREDIR: - convert_to_long_ex(zvalue); - error = curl_easy_setopt(ch-cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) CURL_REDIR_POST_ALL); - break; -#endif case CURLOPT_PRIVATE: case CURLOPT_URL: case CURLOPT_PROXY: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/file.c branches/PHP_5_3/ext/standard/file.c trunk/ext/standard/file.c
iliaaThu, 24 Sep 2009 18:59:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288679 Log: Make tempnam() return FALSE on error as documented Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/file.c U php/php-src/branches/PHP_5_3/ext/standard/file.c U php/php-src/trunk/ext/standard/file.c Modified: php/php-src/branches/PHP_5_2/ext/standard/file.c === --- php/php-src/branches/PHP_5_2/ext/standard/file.c2009-09-24 18:45:09 UTC (rev 288678) +++ php/php-src/branches/PHP_5_2/ext/standard/file.c2009-09-24 18:59:28 UTC (rev 288679) @@ -1018,6 +1018,7 @@ } efree(p); + RETURN_FALSE; } /* }}} */ Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c === --- php/php-src/branches/PHP_5_3/ext/standard/file.c2009-09-24 18:45:09 UTC (rev 288678) +++ php/php-src/branches/PHP_5_3/ext/standard/file.c2009-09-24 18:59:28 UTC (rev 288679) @@ -860,6 +860,7 @@ RETVAL_STRING(opened_path, 0); } efree(p); + RETURN_FALSE; } /* }}} */ Modified: php/php-src/trunk/ext/standard/file.c === --- php/php-src/trunk/ext/standard/file.c 2009-09-24 18:45:09 UTC (rev 288678) +++ php/php-src/trunk/ext/standard/file.c 2009-09-24 18:59:28 UTC (rev 288679) @@ -977,6 +977,7 @@ efree(opened_path); } efree(p); + RETURN_FALSE; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_3/NEWS
jani Thu, 24 Sep 2009 22:40:15 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288693 Log: fn Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-09-24 22:34:20 UTC (rev 288692) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-24 22:40:15 UTC (rev 288693) @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? , PHP 5.2.12 +?? ??? 20??, PHP 5.2.12 - Fixed bug #49647 (DOMUserData does not exist). (Rob) - Fixed bug #49630 (imap_listscan function missing). (Felipe) - Fixed bug #49578 (make install-pear fails). (Hannes) Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-09-24 22:34:20 UTC (rev 288692) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-24 22:40:15 UTC (rev 288693) @@ -1,8 +1,10 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.2 +?? ??? 20??, PHP 5.3.2 - Added ReflectionMethod::setAccessible() for invoking non-public methods through the Reflection API. (Sebastian) + +- Implemented FR #49571 (CURLOPT_POSTREDIR not implemented). (Sriram Natarajan) - Implemented FR #49253 (added support for libcurl's CERTINFO option). (Linus Nielsen Feltzing li...@haxx.se) @@ -10,8 +12,6 @@ - Fixed bug #49630 (imap_listscan function missing). (Felipe) - Fixed bug #49531 (CURLOPT_INFILESIZE sometimes causes warning CURLPROTO_FILE cannot be set). (Felipe) -- Fixed bug #49571 (CURLOPT_POSTREDIR not implemented). - (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1RC? - WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/file.c trunk/ext/standard/file.c
felipe Fri, 25 Sep 2009 01:46:58 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288705
Log:
- Fixed mem leak
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/file.c
U php/php-src/trunk/ext/standard/file.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/file.c2009-09-25 01:45:26 UTC
(rev 288704)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c2009-09-25 01:46:58 UTC
(rev 288705)
@@ -854,13 +854,14 @@
if (p_len 64) {
p[63] = '\0';
}
+
+ RETVAL_FALSE;
if ((fd = php_open_temporary_fd(dir, p, opened_path TSRMLS_CC)) = 0) {
close(fd);
RETVAL_STRING(opened_path, 0);
}
efree(p);
- RETURN_FALSE;
}
/* }}} */
Modified: php/php-src/trunk/ext/standard/file.c
===
--- php/php-src/trunk/ext/standard/file.c 2009-09-25 01:45:26 UTC (rev
288704)
+++ php/php-src/trunk/ext/standard/file.c 2009-09-25 01:46:58 UTC (rev
288705)
@@ -964,6 +964,8 @@
if (p_len 64) {
p[63] = '\0';
}
+
+ RETVAL_FALSE;
if ((fd = php_open_temporary_fd(dir, p, opened_path TSRMLS_CC)) = 0) {
UChar *utmpnam;
@@ -977,7 +979,6 @@
efree(opened_path);
}
efree(p);
- RETURN_FALSE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_basic_016.phpt trunk/ext/curl/tests/curl_basic_016.phpt
felipe Fri, 25 Sep 2009 02:07:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=288707
Log:
- Fix test
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_016.phpt
U php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_016.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_016.phpt
2009-09-25 01:53:02 UTC (rev 288706)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_016.phpt
2009-09-25 02:07:41 UTC (rev 288707)
@@ -12,7 +12,7 @@
?
===DONE===
--EXPECTF--
-array(20) {
+array(2%d) {
[%u|b%url]=
string(0)
[content_type]=
@@ -53,5 +53,6 @@
float(0)
[redirect_time]=
float(0)
+%A
}
===DONE===
Modified: php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt2009-09-25
01:53:02 UTC (rev 288706)
+++ php/php-src/trunk/ext/curl/tests/curl_basic_016.phpt2009-09-25
02:07:41 UTC (rev 288707)
@@ -12,7 +12,7 @@
?
===DONE===
--EXPECTF--
-array(20) {
+array(2%d) {
[%u|b%url]=
string(0)
[ucontent_type]=
@@ -53,5 +53,6 @@
float(%f)
[uredirect_time]=
float(0)
+%A
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
