clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,246 Commits 491 Branches 1,363 Tags 839 MiB
06fdf359e3
Commit Graph

159 Commits

Author SHA1 Message Date
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
6719106257 ported ext/ftp 2014-08-19 21:49:34 +02:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test 
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
 2014-08-11 11:38:41 +04:00
Daniel Lowrey
60552a8871 Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option 2014-08-05 22:43:12 -04:00
Dmitry Stogov
ebe024fd78 Fixed memory leaks 2014-05-06 15:18:17 +04: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
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
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
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
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
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
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Rasmus Lerdorf
d2881adcbc Fix bug 60183 2011-11-01 15:15:51 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +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
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +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
Antony Dovgal
d042fd0675 MFH: php_gmtime_r() fixes 2007-06-07 08:59:00 +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
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
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
Antony Dovgal
e1a63af85b MFH: fix leaks 2006-12-03 13:59:11 +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
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
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
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