[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard string.c
iliaa Tue Feb 13 23:55:20 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
Make sure p is not pointing to the start of the buffer
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.40&r2=1.445.2.14.2.41&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.40
php-src/ext/standard/string.c:1.445.2.14.2.41
--- php-src/ext/standard/string.c:1.445.2.14.2.40 Tue Feb 13 02:16:22 2007
+++ php-src/ext/standard/string.c Tue Feb 13 23:55:20 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.40 2007/02/13 02:16:22 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.41 2007/02/13 23:55:20 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4263,7 +4263,7 @@
tp = ((tp-tbuf) >= PHP_TAG_BUF_SIZE ?
tbuf: tp);
*(tp++) = c;
}
- if (*(p-1) != '\\') {
+ if (p != buf && *(p-1) != '\\') {
in_q = !in_q;
}
break;
--
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) /main/streams plain_wrapper.c
iliaa Tue Feb 13 23:39:14 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams plain_wrapper.c
Log:
Fixed a memory leak on highlight_file() with a non-existant file
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.14&r2=1.52.2.6.2.15&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.14
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.15
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.14 Mon Jan 1 09:36:12 2007
+++ php-src/main/streams/plain_wrapper.cTue Feb 13 23:39:14 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.14 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.15 2007/02/13 23:39:14 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -889,12 +889,12 @@
*opened_path = realpath;
realpath = NULL;
}
- if (realpath) {
- efree(realpath);
- }
/* fall through */
case PHP_STREAM_PERSISTENT_FAILURE:
+ if (realpath) {
+ efree(realpath);
+ }
efree(persistent_id);;
return ret;
}
@@ -933,6 +933,10 @@
r = do_fstat(self, 0);
if ((r == 0 && !S_ISREG(self->sb.st_mode))) {
+ if (opened_path) {
+ efree(*opened_path);
+ *opened_path = NULL;
+ }
php_stream_close(ret);
return NULL;
}
--
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/oci8 php_oci8_int.h
tony2001Tue Feb 13 20:19:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 php_oci8_int.h
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.11.2.6.2.15&r2=1.11.2.6.2.16&diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.15
php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.16
--- php-src/ext/oci8/php_oci8_int.h:1.11.2.6.2.15 Mon Feb 12 09:36:23 2007
+++ php-src/ext/oci8/php_oci8_int.h Tue Feb 13 20:19:56 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8_int.h,v 1.11.2.6.2.15 2007/02/12 09:36:23 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.11.2.6.2.16 2007/02/13 20:19:56 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -223,22 +223,22 @@
#define PHP_OCI_CALL(func, params) \
do { \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
if (OCI_G(debug_mode)) { \
php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
} \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
} while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
do { \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
if (OCI_G(debug_mode)) { \
php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
} \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
} while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 php_oci8_int.h
tony2001Tue Feb 13 20:19:50 2007 UTC
Modified files:
/php-src/ext/oci8 php_oci8_int.h
Log:
output debug messages before calling OCI functions
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.31
php-src/ext/oci8/php_oci8_int.h:1.32
--- php-src/ext/oci8/php_oci8_int.h:1.31Mon Feb 12 09:36:11 2007
+++ php-src/ext/oci8/php_oci8_int.h Tue Feb 13 20:19:50 2007
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8_int.h,v 1.31 2007/02/12 09:36:11 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.32 2007/02/13 20:19:50 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -232,22 +232,22 @@
#define PHP_OCI_CALL(func, params) \
do { \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
if (OCI_G(debug_mode)) { \
php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
} \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
} while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
do { \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
if (OCI_G(debug_mode)) { \
php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
} \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
} while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
--
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/imap php_imap.c
iliaa Tue Feb 13 20:12:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap php_imap.c
Log:
Fixed a memory leak inside imap_utf8()
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.16&r2=1.208.2.7.2.17&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.16
php-src/ext/imap/php_imap.c:1.208.2.7.2.17
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.16 Thu Jan 18 14:03:38 2007
+++ php-src/ext/imap/php_imap.c Tue Feb 13 20:12:52 2007
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.16 2007/01/18 14:03:38 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.17 2007/02/13 20:12:52 iliaa Exp $ */
#define IMAP41
@@ -2215,6 +2215,9 @@
if (dest.data) {
free(dest.data);
}
+ if (src.data) {
+ free(src.data);
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c /ext/standard/tests/general_functions bug34794.phpt
nlopess Tue Feb 13 19:56:42 2007 UTC
Modified files:
/php-src/ext/standard proc_open.c
/php-src/ext/standard/tests/general_functions bug34794.phpt
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.51&r2=1.52&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.51
php-src/ext/standard/proc_open.c:1.52
--- php-src/ext/standard/proc_open.c:1.51 Tue Jan 9 16:27:32 2007
+++ php-src/ext/standard/proc_open.cTue Feb 13 19:56:42 2007
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.51 2007/01/09 16:27:32 dmitry Exp $ */
+/* $Id: proc_open.c,v 1.52 2007/02/13 19:56:42 nlopess Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -945,6 +945,10 @@
descriptors[i].mode_flags), mode_string, NULL);
#else
stream =
php_stream_fopen_from_fd(descriptors[i].parentend, mode_string, NULL);
+# if defined(F_SETFD) && defined(FD_CLOEXEC)
+ /* mark the descriptor close-on-exec, so that
it won't be inherited by potential other children */
+ fcntl(descriptors[i].parentend, F_SETFD,
FD_CLOEXEC);
+# endif
#endif
if (stream) {
zval *retfp;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug34794.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug34794.phpt
diff -u /dev/null php-src/ext/standard/tests/general_functions/bug34794.phpt:1.2
--- /dev/null Tue Feb 13 19:56:42 2007
+++ php-src/ext/standard/tests/general_functions/bug34794.phpt Tue Feb 13
19:56:42 2007
@@ -0,0 +1,34 @@
+--TEST--
+bug #34794: proc_close() hangs when used with two processes
+--SKIPIF--
+
+--FILE--
+ array('pipe', 'r'), 1
=>array('pipe', 'r')), $pipes1);
+
+echo "Opening process 2\n";
+$process2 = proc_open('/bin/cat', array(0 => array('pipe', 'r'), 1
=>array('pipe', 'r')), $pipes2);
+
+
+echo "Closing process 1\n";
+fclose($pipes1[0]);
+fclose($pipes1[1]);
+proc_close($process1);
+
+echo "Closing process 2\n";
+fclose($pipes2[0]);
+fclose($pipes2[1]);
+proc_close($process2);
+
+echo "Done\n";
+
+?>
+--EXPECTF--
+Opening process 1
+Opening process 2
+Closing process 1
+Closing process 2
+Done
--
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/standard proc_open.c /ext/standard/tests/general_functions bug34794.phpt
nlopess Tue Feb 13 19:53:42 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions bug34794.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard proc_open.c
Log:
Fixed bug #34794 (proc_close() hangs when used with two processes)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.536&r2=1.2027.2.547.2.537&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.536 php-src/NEWS:1.2027.2.547.2.537
--- php-src/NEWS:1.2027.2.547.2.536 Tue Feb 13 18:29:10 2007
+++ php-src/NEWSTue Feb 13 19:53:42 2007
@@ -17,6 +17,8 @@
- Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
- Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)
+- Fixed bug #34794 (proc_close() hangs when used with two processes).
+ (jdolecek at netbsd dot org, Nuno)
08 Feb 2007, PHP 5.2.1
- Added read-timeout context option "timeout" for HTTP streams. (Hannes,
Ilia).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.9&r2=1.36.2.1.2.10&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.9
php-src/ext/standard/proc_open.c:1.36.2.1.2.10
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.9 Tue Feb 13 15:55:45 2007
+++ php-src/ext/standard/proc_open.cTue Feb 13 19:53:42 2007
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.9 2007/02/13 15:55:45 tony2001 Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.10 2007/02/13 19:53:42 nlopess Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -943,6 +943,10 @@
descriptors[i].mode_flags), mode_string, NULL);
#else
stream =
php_stream_fopen_from_fd(descriptors[i].parentend, mode_string, NULL);
+# if defined(F_SETFD) && defined(FD_CLOEXEC)
+ /* mark the descriptor close-on-exec, so that
it won't be inherited by potential other children */
+ fcntl(descriptors[i].parentend, F_SETFD,
FD_CLOEXEC);
+# endif
#endif
if (stream) {
zval *retfp;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug34794.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/general_functions/bug34794.phpt
+++ php-src/ext/standard/tests/general_functions/bug34794.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_2) /main/streams userspace.c
tony2001Tue Feb 13 19:50:59 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams userspace.c
Log:
MFH: improve php_userstreamop_seek()
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.3&r2=1.31.2.3.2.4&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.3
php-src/main/streams/userspace.c:1.31.2.3.2.4
--- php-src/main/streams/userspace.c:1.31.2.3.2.3 Mon Jan 15 17:07:07 2007
+++ php-src/main/streams/userspace.cTue Feb 13 19:50:59 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.3 2007/01/15 17:07:07 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.4 2007/02/13 19:50:59 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -759,6 +759,10 @@
retval = NULL;
}
+ if (ret) {
+ return ret;
+ }
+
/* now determine where we are */
ZVAL_STRINGL(&func_name, USERSTREAM_TELL, sizeof(USERSTREAM_TELL)-1, 0);
@@ -768,16 +772,20 @@
&retval,
0, NULL, 0, NULL TSRMLS_CC);
- if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) ==
IS_LONG)
+ if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) ==
IS_LONG) {
*newoffs = Z_LVAL_P(retval);
- else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_TELL " is not implemented!",
- us->wrapper->classname);
+ ret = 0;
+ } else if (call_result == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_TELL " is not implemented!", us->wrapper->classname);
+ ret = -1;
+ } else {
+ ret = -1;
+ }
- if (retval)
+ if (retval) {
zval_ptr_dtor(&retval);
-
- return 0;
+ }
+ return ret;
}
/* parse the return value from one of the stat functions and store the
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams userspace.c
tony2001Tue Feb 13 19:50:13 2007 UTC
Modified files:
/php-src/main/streams userspace.c
Log:
improve php_userstreamop_seek()
check for errors in stream_seek() and return correct status
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.40&r2=1.41&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.40
php-src/main/streams/userspace.c:1.41
--- php-src/main/streams/userspace.c:1.40 Wed Jan 24 21:43:47 2007
+++ php-src/main/streams/userspace.cTue Feb 13 19:50:13 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.40 2007/01/24 21:43:47 pollita Exp $ */
+/* $Id: userspace.c,v 1.41 2007/02/13 19:50:13 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -759,6 +759,10 @@
retval = NULL;
}
+ if (ret) {
+ return ret;
+ }
+
/* now determine where we are */
ZVAL_STRINGL(&func_name, USERSTREAM_TELL, sizeof(USERSTREAM_TELL)-1, 0);
@@ -768,16 +772,20 @@
&retval,
0, NULL, 0, NULL TSRMLS_CC);
- if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) ==
IS_LONG)
+ if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) ==
IS_LONG) {
*newoffs = Z_LVAL_P(retval);
- else
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_TELL " is not implemented!",
- us->wrapper->classname);
+ ret = 0;
+ } else if (call_result == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::"
USERSTREAM_TELL " is not implemented!", us->wrapper->classname);
+ ret = -1;
+ } else {
+ ret = -1;
+ }
- if (retval)
+ if (retval) {
zval_ptr_dtor(&retval);
-
- return 0;
+ }
+ return ret;
}
/* parse the return value from one of the stat functions and store the
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
mj Tue Feb 13 18:41:56 2007 UTC Modified files: /CVSROOTavail Log: * PEAR karma for Christian Schmidt http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1242&r2=1.1243&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1242 CVSROOT/avail:1.1243 --- CVSROOT/avail:1.1242Tue Feb 13 07:48:15 2007 +++ CVSROOT/avail Tue Feb 13 18:41:56 2007 @@ -373,6 +373,7 @@ avail|ssttoo|pear/Image_Text,pear/Text_Highlighter avail|wharmby|php-src avail|shangxiao|pear/HTML_QuickForm_altselect +avail|schmidt|pear/OLE,peardoc # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ftp ftp.c /ext/ftp/tests bug37799.phpt server.inc
nlopess Tue Feb 13 18:30:19 2007 UTC
Modified files:
/php-src/ext/ftpftp.c
/php-src/ext/ftp/tests bug37799.phpt server.inc
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/ftp.c?r1=1.120&r2=1.121&diff_format=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.120 php-src/ext/ftp/ftp.c:1.121
--- php-src/ext/ftp/ftp.c:1.120 Mon Jan 1 09:29:23 2007
+++ php-src/ext/ftp/ftp.c Tue Feb 13 18:30:19 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.120 2007/01/01 09:29:23 sebastian Exp $ */
+/* $Id: ftp.c,v 1.121 2007/02/13 18:30:19 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -266,60 +266,57 @@
}
if (ftp->resp != 334) {
- ftp->use_ssl = 0;
+ return 0;
} else {
ftp->old_ssl = 1;
ftp->use_ssl_for_data = 1;
}
}
- /* now enable ssl if we still need to */
- if (ftp->use_ssl) {
- ctx = SSL_CTX_new(SSLv23_client_method());
- if (ctx == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL context");
+ ctx = SSL_CTX_new(SSLv23_client_method());
+ if (ctx == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to
create the SSL context");
+ return 0;
+ }
+
+ SSL_CTX_set_options(ctx, SSL_OP_ALL);
+
+ ftp->ssl_handle = SSL_new(ctx);
+ if (ftp->ssl_handle == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to
create the SSL handle");
+ SSL_CTX_free(ctx);
+ return 0;
+ }
+
+ SSL_set_fd(ftp->ssl_handle, ftp->fd);
+
+ if (SSL_connect(ftp->ssl_handle) <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL/TLS
handshake failed");
+ SSL_shutdown(ftp->ssl_handle);
+ return 0;
+ }
+
+ ftp->ssl_active = 1;
+
+ if (!ftp->old_ssl) {
+
+ /* set protection buffersize to zero */
+ if (!ftp_putcmd(ftp, "PBSZ", "0")) {
+ return 0;
+ }
+ if (!ftp_getresp(ftp)) {
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
-
- ftp->ssl_handle = SSL_new(ctx);
- if (ftp->ssl_handle == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL handle");
- SSL_CTX_free(ctx);
+ /* enable data conn encryption */
+ if (!ftp_putcmd(ftp, "PROT", "P")) {
return 0;
}
-
- SSL_set_fd(ftp->ssl_handle, ftp->fd);
-
- if (SSL_connect(ftp->ssl_handle) <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"SSL/TLS handshake failed");
- SSL_shutdown(ftp->ssl_handle);
+ if (!ftp_getresp(ftp)) {
return 0;
}
- ftp->ssl_active = 1;
-
- if (!ftp->old_ssl) {
-
- /* set protection buffersize to zero */
- if (!ftp_putcmd(ftp, "PBSZ", "0")) {
- return 0;
- }
- if (!ftp_getresp(ftp)) {
- return 0;
- }
-
- /* enable data conn encryption */
- if (!ftp_putcmd(ftp, "PROT", "P")) {
- return 0;
- }
- if (!ftp_getresp(ftp)) {
- return 0;
- }
-
- ftp->use_ssl_for_data = (ftp->resp >= 200 &&
ftp->resp <=299);
- }
+ ftp->use_ssl_for_data = (ftp->resp >= 200 && ftp->resp
<=299);
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/ftp ftp.c /ext/ftp/tests bug37799.phpt server.inc
nlopess Tue Feb 13 18:29:10 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/ftp/tests bug37799.phpt
Modified files:
/php-srcNEWS
/php-src/ext/ftpftp.c
/php-src/ext/ftp/tests server.inc
Log:
Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.535&r2=1.2027.2.547.2.536&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.535 php-src/NEWS:1.2027.2.547.2.536
--- php-src/NEWS:1.2027.2.547.2.535 Tue Feb 13 15:55:45 2007
+++ php-src/NEWSTue Feb 13 18:29:10 2007
@@ -16,6 +16,7 @@
- Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony)
- Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
+- Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)
08 Feb 2007, PHP 5.2.1
- Added read-timeout context option "timeout" for HTTP streams. (Hannes,
Ilia).
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/ftp.c?r1=1.112.2.4.2.3&r2=1.112.2.4.2.4&diff_format=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.112.2.4.2.3 php-src/ext/ftp/ftp.c:1.112.2.4.2.4
--- php-src/ext/ftp/ftp.c:1.112.2.4.2.3 Mon Jan 1 09:36:01 2007
+++ php-src/ext/ftp/ftp.c Tue Feb 13 18:29:10 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ftp.c,v 1.112.2.4.2.3 2007/01/01 09:36:01 sebastian Exp $ */
+/* $Id: ftp.c,v 1.112.2.4.2.4 2007/02/13 18:29:10 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -266,60 +266,57 @@
}
if (ftp->resp != 334) {
- ftp->use_ssl = 0;
+ return 0;
} else {
ftp->old_ssl = 1;
ftp->use_ssl_for_data = 1;
}
}
- /* now enable ssl if we still need to */
- if (ftp->use_ssl) {
- ctx = SSL_CTX_new(SSLv23_client_method());
- if (ctx == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL context");
+ ctx = SSL_CTX_new(SSLv23_client_method());
+ if (ctx == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to
create the SSL context");
+ return 0;
+ }
+
+ SSL_CTX_set_options(ctx, SSL_OP_ALL);
+
+ ftp->ssl_handle = SSL_new(ctx);
+ if (ftp->ssl_handle == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to
create the SSL handle");
+ SSL_CTX_free(ctx);
+ return 0;
+ }
+
+ SSL_set_fd(ftp->ssl_handle, ftp->fd);
+
+ if (SSL_connect(ftp->ssl_handle) <= 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL/TLS
handshake failed");
+ SSL_shutdown(ftp->ssl_handle);
+ return 0;
+ }
+
+ ftp->ssl_active = 1;
+
+ if (!ftp->old_ssl) {
+
+ /* set protection buffersize to zero */
+ if (!ftp_putcmd(ftp, "PBSZ", "0")) {
+ return 0;
+ }
+ if (!ftp_getresp(ftp)) {
return 0;
}
- SSL_CTX_set_options(ctx, SSL_OP_ALL);
-
- ftp->ssl_handle = SSL_new(ctx);
- if (ftp->ssl_handle == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"failed to create the SSL handle");
- SSL_CTX_free(ctx);
+ /* enable data conn encryption */
+ if (!ftp_putcmd(ftp, "PROT", "P")) {
return 0;
}
-
- SSL_set_fd(ftp->ssl_handle, ftp->fd);
-
- if (SSL_connect(ftp->ssl_handle) <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"SSL/TLS handshake failed");
- SSL_shutdown(ftp->ssl_handle);
+ if (!ftp_getresp(ftp)) {
return 0;
}
- ftp->ssl_active = 1;
-
- if (!ftp->old_ssl) {
-
- /* set protection buffersize to zero */
-
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Feb 13 18:22:07 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: - Back to -dev. http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.33&r2=1.66.2.81.2.34&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.33 php-src/main/php_version.h:1.66.2.81.2.34 --- php-src/main/php_version.h:1.66.2.81.2.33 Tue Feb 13 18:20:10 2007 +++ php-src/main/php_version.h Tue Feb 13 18:22:06 2007 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "4.4.5" +#define PHP_RELEASE_VERSION 6 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "4.4.6-dev" http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.37&r2=1.396.2.164.2.38&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.37 php-src/configure.in:1.396.2.164.2.38 --- php-src/configure.in:1.396.2.164.2.37 Tue Feb 13 18:20:11 2007 +++ php-src/configure.inTue Feb 13 18:22:06 2007 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.37 2007/02/13 18:20:11 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.38 2007/02/13 18:22:06 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -37,8 +37,8 @@ MAJOR_VERSION=4 MINOR_VERSION=4 -RELEASE_VERSION=5 -EXTRA_VERSION="" +RELEASE_VERSION=6 +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.191&r2=1.1247.2.920.2.192&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.191 php-src/NEWS:1.1247.2.920.2.192 --- php-src/NEWS:1.1247.2.920.2.191 Tue Feb 13 18:20:11 2007 +++ php-src/NEWSTue Feb 13 18:22:06 2007 @@ -1,5 +1,7 @@ PHP 4 NEWS ||| +?? ??? 2007, Version 4.4.6 + 14 Feb 2007, Version 4.4.5 - Upgraded PEAR to 1.5.0. (Greg) - Updated PCRE to version 6.7. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Feb 13 18:20:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: - Package 4.4.5. http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.32&r2=1.66.2.81.2.33&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.32 php-src/main/php_version.h:1.66.2.81.2.33 --- php-src/main/php_version.h:1.66.2.81.2.32 Thu Feb 1 08:55:41 2007 +++ php-src/main/php_version.h Tue Feb 13 18:20:10 2007 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "4.4.5RC3-dev" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "4.4.5" http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.36&r2=1.396.2.164.2.37&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.36 php-src/configure.in:1.396.2.164.2.37 --- php-src/configure.in:1.396.2.164.2.36 Thu Feb 1 08:55:41 2007 +++ php-src/configure.inTue Feb 13 18:20:11 2007 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.36 2007/02/01 08:55:41 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.37 2007/02/13 18:20:11 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=5 -EXTRA_VERSION="RC3-dev" +EXTRA_VERSION="" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.190&r2=1.1247.2.920.2.191&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.190 php-src/NEWS:1.1247.2.920.2.191 --- php-src/NEWS:1.1247.2.920.2.190 Mon Feb 12 17:13:22 2007 +++ php-src/NEWSTue Feb 13 18:20:11 2007 @@ -1,30 +1,25 @@ PHP 4 NEWS ||| -?? Feb 2007, Version 4.4.5 -- Fixed bug #40335 (Compile fails when using GCC 4.1.1/binutils 2.17). (Tony) - -01 Feb 2007, Version 4.4.5RC2 -- Fixed bug #39819 (Using $this not in object context can cause segfaults). - (Dmitry) -- Fixed bug #36248 (CURLOPT_HEADERFUNCTION, couldn't set the function in the - class). (Ilia) -- Backported a fix in the configure tests to detect the "rounding fuzz". - (Derick, Joe Orton) -- Backported fix for ext/imap compilation failure with recent c-client - versions. (Tony) +14 Feb 2007, Version 4.4.5 - Upgraded PEAR to 1.5.0. (Greg) +- Updated PCRE to version 6.7. (Ilia) - Moved extensions to PECL: . ext/ovrimos (Derick) -04 Jan 2007, Version 4.4.5RC1 - Added a meta tag to phpinfo() output to prevent search engines from indexing the page. (Ilia) -- Updated PCRE to version 6.7. (Ilia) +- Backported a fix in the configure tests to detect the "rounding fuzz". + (Derick, Joe Orton) +- Backported fix for ext/imap compilation failure with recent c-client + versions. (Tony) - Fixed missing open_basedir check inside chdir() function. (Ilia) +- Fixed bug #40335 (Compile fails when using GCC 4.1.1/binutils 2.17). (Tony) - Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for timestamp fields). (Ilia) - Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR install path). (Tony) +- Fixed bug #39819 (Using $this not in object context can cause segfaults). + (Dmitry) - Fixed bug #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4 support is enabled). (Tony) - Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony) @@ -48,6 +43,8 @@ - Fixed bug #37812 (aggregate_methods_by_list fails to take certain methods). (Hannes) - Fixed bug #36975 (natcasesort() causes array_pop() to misbehave). (Hannes) +- Fixed bug #36248 (CURLOPT_HEADERFUNCTION, couldn't set the function in the + class). (Ilia) - Fixed bug #34066 (recursive array_walk causes segfault). (Tony) 17 Aug 2006, Version 4.4.4 -- 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/standard proc_open.c
tony2001Tue Feb 13 15:55:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/standard proc_open.c Log: fix #40455 (proc_open() uses wrong commandline when safe_mode_exec_dir is set) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.534&r2=1.2027.2.547.2.535&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.534 php-src/NEWS:1.2027.2.547.2.535 --- php-src/NEWS:1.2027.2.547.2.534 Tue Feb 13 02:16:22 2007 +++ php-src/NEWSTue Feb 13 15:55:45 2007 @@ -5,9 +5,13 @@ - Upgraded PCRE to version 7.0 (Nuno) - Add --ri switch to CLI which allows to check extension information. (Marcus) - Added tidyNode::getParent() method (John, Nuno) +- Fixed bug #40455 (proc_open() uses wrong commandline when safe_mode_exec_dir + is set). (Tony) - Fixed bug #40432 (strip_tags() fails with greater than in attribute). (Ilia) - Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty methods). (Tony) +- Fixed bug #40451 (addAttribute() may crash when used with non-existent child + node). (Tony) - Fixed bug #40428 (imagepstext() doesn't accept optional parameter). (Pierre) - Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony) - Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.8&r2=1.36.2.1.2.9&diff_format=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.8 php-src/ext/standard/proc_open.c:1.36.2.1.2.9 --- php-src/ext/standard/proc_open.c:1.36.2.1.2.8 Tue Jan 9 16:27:17 2007 +++ php-src/ext/standard/proc_open.cTue Feb 13 15:55:45 2007 @@ -15,7 +15,7 @@ | Author: Wez Furlong <[EMAIL PROTECTED]> | +--+ */ -/* $Id: proc_open.c,v 1.36.2.1.2.8 2007/01/09 16:27:17 dmitry Exp $ */ +/* $Id: proc_open.c,v 1.36.2.1.2.9 2007/02/13 15:55:45 tony2001 Exp $ */ #if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__)) # define _BSD_SOURCE /* linux wants this when XOPEN mode is on */ @@ -276,7 +276,7 @@ sep = zend_memrchr(arg0, PHP_DIR_SEPARATOR, larg0); - spprintf(safecmd, 0, "%s%c%s%s", PG(safe_mode_exec_dir), (sep ? *sep : '/'), (sep ? "" : arg0), (space ? cmd + larg0 : "")); + spprintf(safecmd, 0, "%s%s%s%s", PG(safe_mode_exec_dir), (sep ? sep : "/"), (sep ? "" : arg0), (space ? cmd + larg0 : "")); efree(arg0); arg0 = php_escape_shell_cmd(*safecmd); -- 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/standard file.c
tony2001Tue Feb 13 12:56:37 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.15&r2=1.409.2.6.2.16&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.15
php-src/ext/standard/file.c:1.409.2.6.2.16
--- php-src/ext/standard/file.c:1.409.2.6.2.15 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/file.c Tue Feb 13 12:56:36 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.15 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.16 2007/02/13 12:56:36 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -546,7 +546,8 @@
}
if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to
position %ld in the stream.", offset);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to
position %ld in the stream", offset);
+ php_stream_close(stream);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
tony2001Tue Feb 13 12:56:10 2007 UTC
Modified files:
/php-src/ext/standard file.c
Log:
plug possible leak
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.483&r2=1.484&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.483 php-src/ext/standard/file.c:1.484
--- php-src/ext/standard/file.c:1.483 Wed Jan 10 20:12:14 2007
+++ php-src/ext/standard/file.c Tue Feb 13 12:56:10 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.483 2007/01/10 20:12:14 helly Exp $ */
+/* $Id: file.c,v 1.484 2007/02/13 12:56:10 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -568,6 +568,7 @@
if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to
position %ld in the stream", offset);
+ php_stream_close(stream);
RETURN_FALSE;
}
--
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/filter .cvsignore /ext/pdo .cvsignore /ext/pdo_sqlite .cvsignore /ext/xmlreader .cvsignore /ext/zip .cvsignore /ext/zip/lib .cvsignore
tony2001Tue Feb 13 10:07:39 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/filter .cvsignore /php-src/ext/pdo.cvsignore /php-src/ext/pdo_sqlite .cvsignore /php-src/ext/xmlreader .cvsignore /php-src/ext/zip/lib.cvsignore /php-src/ext/zip.cvsignore Log: fix .cvsignore's http://cvs.php.net/viewvc.cgi/php-src/ext/filter/.cvsignore?r1=1.1&r2=1.1.2.1&diff_format=u Index: php-src/ext/filter/.cvsignore diff -u php-src/ext/filter/.cvsignore:1.1 php-src/ext/filter/.cvsignore:1.1.2.1 --- php-src/ext/filter/.cvsignore:1.1 Tue Sep 6 18:46:37 2005 +++ php-src/ext/filter/.cvsignore Tue Feb 13 10:07:38 2007 @@ -47,3 +47,5 @@ autom4te.cache run-tests-config.php run-tests.php +*.gcda +*.gcno http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/.cvsignore?r1=1.4&r2=1.4.4.1&diff_format=u Index: php-src/ext/pdo/.cvsignore diff -u php-src/ext/pdo/.cvsignore:1.4 php-src/ext/pdo/.cvsignore:1.4.4.1 --- php-src/ext/pdo/.cvsignore:1.4 Tue Jun 14 13:26:09 2005 +++ php-src/ext/pdo/.cvsignore Tue Feb 13 10:07:39 2007 @@ -29,3 +29,5 @@ mkinstalldirs modules conftest* +*.gcda +*.gcno http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/.cvsignore?r1=1.4.2.1&r2=1.4.2.1.2.1&diff_format=u Index: php-src/ext/pdo_sqlite/.cvsignore diff -u php-src/ext/pdo_sqlite/.cvsignore:1.4.2.1 php-src/ext/pdo_sqlite/.cvsignore:1.4.2.1.2.1 --- php-src/ext/pdo_sqlite/.cvsignore:1.4.2.1 Sat Sep 24 14:21:29 2005 +++ php-src/ext/pdo_sqlite/.cvsignore Tue Feb 13 10:07:39 2007 @@ -30,3 +30,5 @@ modules conftest* sqlite3.h +*.gcda +*.gcno http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/.cvsignore?r1=1.1&r2=1.1.4.1&diff_format=u Index: php-src/ext/xmlreader/.cvsignore diff -u php-src/ext/xmlreader/.cvsignore:1.1 php-src/ext/xmlreader/.cvsignore:1.1.4.1 --- php-src/ext/xmlreader/.cvsignore:1.1Mon Apr 19 18:55:02 2004 +++ php-src/ext/xmlreader/.cvsignoreTue Feb 13 10:07:39 2007 @@ -45,3 +45,5 @@ mkinstalldirs modules scan_makefile_in.awk +*.gcda +*.gcno http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/.cvsignore?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/zip/lib/.cvsignore diff -u php-src/ext/zip/lib/.cvsignore:1.1.2.3 php-src/ext/zip/lib/.cvsignore:1.1.2.4 --- php-src/ext/zip/lib/.cvsignore:1.1.2.3 Mon Sep 18 17:22:53 2006 +++ php-src/ext/zip/lib/.cvsignore Tue Feb 13 10:07:39 2007 @@ -1,2 +1,4 @@ *.lo .libs +*.gcda +*.gcno http://cvs.php.net/viewvc.cgi/php-src/ext/zip/.cvsignore?r1=1.7.2.3&r2=1.7.2.4&diff_format=u Index: php-src/ext/zip/.cvsignore diff -u php-src/ext/zip/.cvsignore:1.7.2.3 php-src/ext/zip/.cvsignore:1.7.2.4 --- php-src/ext/zip/.cvsignore:1.7.2.3 Mon Sep 18 17:22:53 2006 +++ php-src/ext/zip/.cvsignore Tue Feb 13 10:07:39 2007 @@ -1,2 +1,49 @@ +#*# +*.dsw +*.la *.lo +*.ncb +*.opt +*.plg +*.tgz +*~ +.#* +.deps .libs +Debug +Debug_TS +Makefile +Makefile.fragments +Makefile.global +Makefile.objects +Release +Release_TS +Release_TSDbg +Release_TS_inline +Release_inline +acinclude.m4 +aclocal.m4 +autom4te.cache +build +config.cache +config.guess +config.h +config.h.in +config.log +config.nice +config.status +config.sub +configure +configure.in +conftest +conftest.c +include +install-sh +libtool +ltmain.sh +missing +mkinstalldirs +modules +scan_makefile_in.awk +*.gcda +*.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
