clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 20:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
92,184 Commits 493 Branches 1,366 Tags 850 MiB
1372909429
Commit Graph

339 Commits

Author SHA1 Message Date
krakjoe
360962ea29 fix ftp for ng 2014-05-06 07:54:54 +01:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Nikita Popov
c7ee97eea0 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6 Fix leak caused by fix to bug #65667 
ftp->stream is now closed in the ftp resource dtor.
 2013-12-30 13:53:12 +01:00
Ferenc Kovacs
91108818e1 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/spl/tests/SplFileObject_rewind_error001.phpt
 2013-11-06 10:46:34 +01:00
ptarjan
9c1e1bbc05 fix many parallel test issues 
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
 2013-11-06 10:31:47 +01:00
Rasmus Lerdorf
288a4ec3bd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Clean up this weird safe_emalloc() call
 2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b Clean up this weird safe_emalloc() call 2013-10-20 09:36:50 -07:00
Rasmus Lerdorf
c5e5a6c2ac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Minor Coverity tweaks
 2013-10-20 08:56:24 -07:00
Rasmus Lerdorf
1494298231 Minor Coverity tweaks 2013-10-20 08:55:48 -07:00
Rasmus Lerdorf
683a7d719b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove senseless check here
 2013-10-19 20:56:01 -07:00
Rasmus Lerdorf
fb38fdc7fd Remove senseless check here 2013-10-19 20:55:02 -07:00
Nikita Popov
90f0a77cad Merge branch 'PHP-5.4' into PHP-5.5 2013-10-04 17:26:35 +02:00
Philip Hofstetter
96cc419924 Fix bug #65667: ftp_nb_continue produces segfault 
the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.

As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.

This regression was added in a93a462dce
and this patch restores the behavior that was seen pre-patch.
 2013-10-04 17:25:46 +02:00
Christopher Jones
83469477e7 Remove compile warnings: 
warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
 2013-08-19 17:48:46 -07:00
Andreas Streichardt
a93a462dce First fixes for a 64bit compatible ftp extension 2013-08-04 19:31:30 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Felipe Pena
0863a0d6a0 - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch 2013-07-13 17:54:31 -03:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Scott MacVicar
398c6e6d11 MFH r322485 
Fix possible attack in SSL sockets with SSL 3.0 / TLS 1.0.
CVE-2011-3389
 2012-01-26 05:15:57 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Rasmus Lerdorf
09f8573a77 Fix bug 60183 2011-11-01 15:15:51 +00:00
Rasmus Lerdorf
d2881adcbc Fix bug 60183 2011-11-01 15:15:51 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Ilia Alshanetsky
4db5175f54 Fixed bug #51190 (ftp_put() returns false when transfer was successful). 2010-03-04 12:52:58 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Rasmus Lerdorf
99f469f707 Fix null deref found by Michael Maclean 2009-11-24 13:57:39 +00:00
Sriram Natarajan
ac2d3990f2 - Fixed bug #49447 (php engine need to correctly check for socket API 
return status on windows). (Sriram Natarajan)
 2009-09-04 07:59:48 +00:00
Zoe Slattery
c0c141d0cf server for ftp tests 2009-08-30 09:31:54 +00:00
Zoe Slattery
6a22ec3eda More tests from 2009 testfest 2009-08-30 09:30:13 +00:00
Antony Dovgal
e3e34fa7ed MF52: fix test: don't create tmp files in "." and clean up when done 2009-01-09 23:12:12 +00:00
Zoe Slattery
6d246c060b new test from Nat Mcugh 2008-12-31 20:06:26 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Zoe Slattery
7156227045 New FTP test from Nathaniel McHugh 2008-12-17 12:35:26 +00:00
Zoe Slattery
9271f52838 FTP test from Nathaniel McHugh 2008-12-05 16:28:16 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Pierre Joye
f8a7c37c83 - MFH: don't use inet_ntop when not present 2008-07-12 23:26:02 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Antony Dovgal
d042fd0675 MFH: php_gmtime_r() fixes 2007-06-07 08:59:00 +00:00
Antony Dovgal
1f65545121 fix test names 2007-05-07 18:03:01 +00:00
Ilia Alshanetsky
bc1f7356d7 Fixed CRLF injection inside ftp_putcmd(). 
# Reported on BugTraq by loveshell[at]Bug.Center.Team
 2007-03-24 16:25:42 +00:00
Martin Kraemer
9c62ddde34 Typo 2007-03-14 09:58:14 +00:00
Ilia Alshanetsky
efad70c2cc snprintf() -> slprintf() 2007-02-27 03:28:17 +00:00
Stanislav Malyshev
33956fc358 fix typo 2007-02-24 02:45:24 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Antony Dovgal
22a866818b fix test 2007-02-21 19:22:28 +00:00
Nuno Lopes
3d65d6d8d9 Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection) 2007-02-13 18:29:10 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Hannes Magnusson
b12e3e1475 Fix tests 2006-12-19 10:03:24 +00:00
Antony Dovgal
e1a63af85b MFH: fix leaks 2006-12-03 13:59:11 +00:00
Nuno Lopes
e65bdffab5 tests + BFN 2006-12-01 16:37:39 +00:00
Nuno Lopes
8e0cf44164 fix bug #39458: ftp_nlist() returns false on empty dirs 2006-12-01 16:34:43 +00:00
Antony Dovgal
a3c2958f22 MFH: fix test on FreeBSD 2006-11-27 11:43:59 +00:00
Nuno Lopes
e8384cbcca more tests 2006-11-24 20:18:54 +00:00
Nuno Lopes
d64b17543c fix tests after Tony's commit and add a test for the bug he fixed 2006-11-24 15:47:45 +00:00
Antony Dovgal
050e32ed65 fix test 2006-11-24 13:40:43 +00:00
Antony Dovgal
7f235792b3 MFH: fix #39583 (ftp_put() does not change transfer mode to ASCII) 2006-11-24 12:39:39 +00:00
Nuno Lopes
94a810755f add tests for 2 old bugs 2006-11-23 20:47:38 +00:00
Nuno Lopes
ba8ba5a909 add two more tests (test bogus parameters and bogus server respsnes) 2006-11-23 17:34:34 +00:00
Nuno Lopes
bd519ae0d9 new tests. what a crazy idea... 2006-11-19 18:37:28 +00:00
Hannes Magnusson
21b0f60332 MFH: argument infos 2006-06-11 20:03:05 +00:00
Antony Dovgal
bace0def1e fix spelling in error messages: 
greater/less thEn -> greater/less thAn
 2006-04-03 09:14:33 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
Ilia Alshanetsky
82814fc852 Fixed bug #31971 (ftp_login fails on some SSL servers). 
Patch by: frantisek at augusztin dot com
 2005-11-05 22:02:15 +00:00
Brian France
890bd3f002 Fixed phpize build (default PHP_OPENSSL to no if not set) 2005-11-01 00:32:21 +00:00
foobar
b1d0f9bb43 typofix 2005-10-09 20:44:02 +00:00
foobar
e403b15ebb MFH: - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared). 2005-10-09 20:39:42 +00:00
foobar
286d53397a MFH 2005-08-18 12:40:41 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Ilia Alshanetsky
b36d4ae02c Added bindto socket context option. 2005-06-14 02:39:42 +00:00
Ilia Alshanetsky
fed3058fba Fixed compiler warning on win32. 2005-03-17 17:16:43 +00:00
Ilia Alshanetsky
ff80321587 Final set of fixes for bug #27633. 
# Many thanks to Edin for helpind analyze and resolve this bug.
 2005-03-10 23:37:45 +00:00
Ilia Alshanetsky
21ff96859e Fixes to ascii downloads on win32. 2005-03-09 20:52:38 +00:00
Ilia Alshanetsky
f2eb0acfcf Fixed bug #27633 (Double \r\r problem on ftp_get in ASCII mode on Win32). 2005-02-17 15:37:24 +00:00
Ilia Alshanetsky
e35adfe522 Fixed bug #30027 (Possible crash inside ftp_get()). 
# Patch by cfield at affinitysolutions dot com
 2004-10-05 23:53:09 +00:00
Anantha Kesari H Y
5da74deab9 removed unwanted NEW_LIBC checks 2004-09-27 14:29:55 +00:00
Anantha Kesari H Y
e12ea3c30d removed redundant NEW_LIBC check 2004-09-27 14:25:13 +00:00
Wez Furlong
99e290f882 Fix for Bug #24189: possibly unsafe select(2) usage. 
We avoid the problem by using poll(2).

On systems without poll(2) (older bsd-ish systems, and win32), we emulate
poll(2) using select(2) and check for valid descriptors before attempting
to access them via the descriptor sets.

If an out-of-range descriptor is detected, an E_WARNING is raised suggesting
that PHP should be recompiled with a larger FD_SETSIZE (and also with a
suggested value).

Most uses of select(2) in the source are to poll a single descriptor, so
a couple of handy wrapper functions have been added to make this easier.

A configure option --enable-fd-setsize has been added to both the unix and
win32 builds; on unix we default to 16384 and on windows we default to 256.
Windows FD_SETSIZE imposes a limit on the maximum number of descriptors that
can be select()ed at once, whereas the unix FD_SETSIZE limit is based on the
highest numbered descriptor; 256 should be plenty for PHP scripts under windows
(the default OS setting is 64).

The win32 specific parts are untested; will do that now.
 2004-09-17 12:44:56 +00:00
Ilia Alshanetsky
dbc60edabf Fixed bug #27809 (ftp_systype returns null on some ftp servers). 2004-03-31 20:43:40 +00:00
Hartmut Holzgraefe
eeb172b29f "The Visa to Sibiria" (work in progress) 
Adding a package.xml to a bundled extension does not only
ease the transition to PECL whereever suitable but also
allows to build and install an extension as "shared" using
the PEAR installer without having to deal with phpize and
friends by hand
 2004-03-23 19:46:10 +00:00
Ilia Alshanetsky
b176ee99d3 Fixed bug #27633 (Incorrect EOL translation by ftp_get() in ASCII mode). 2004-03-18 17:12:07 +00:00
Sara Golemon
85aa47efab Don't rely on ANSI tmpfile(), use the streams layer instead, it'll deal with platform issues. 2004-03-04 22:24:27 +00:00
Ard Biesheuvel
81f05c18f5 Wordsize fixes 2004-02-25 20:16:27 +00:00
Sara Golemon
c23305e184 Avoid use of memcpy(), reply on struct in_addr to be right sized instead 2004-02-21 19:37:37 +00:00