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
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