Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

change from GPL to BSD.

make new release, with autoconf.


git-svn-id: http://code.sixapart.com/svn/memcached/trunk@23 b0b603af-a30f-0410-a34e-baf09ae79d0b
  • Loading branch information...
commit 0c3b47f4c8d3983fe38f5b68a75b0ea37b6fcf54 1 parent 21c6761
Brad Fitzpatrick authored June 15, 2003
3  ChangeLog
... ...
@@ -1,7 +1,8 @@
1  
-2003-06-14
  1
+2003-06-15
2 2
 	* update to version 1.0.2
3 3
 	* autoconf/automake fixes for older versions
4 4
 	* make stats report version number
  5
+	* change license from GPL to BSD
5 6
 	
6 7
 Fri, 13 Jun 2003 10:05:51 -0700  Evan Martin  <martine@danga.com>
7 8
 
379  LICENSE
... ...
@@ -1,349 +1,30 @@
1  
- *  memcached - memory caching daemon
2  
- *
3  
- *       http://www.danga.com/memcached/
4  
- *
5  
- *  Copyright 2003 Danga Interactive, Inc.  All rights reserved.
6  
- *
7  
- *  Use and distribution licensed under the GNU General Public License (GPL)
8  
- *
9  
-
10  
-		    GNU GENERAL PUBLIC LICENSE
11  
-		       Version 2, June 1991
12  
-
13  
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
14  
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
15  
- Everyone is permitted to copy and distribute verbatim copies
16  
- of this license document, but changing it is not allowed.
17  
-
18  
-			    Preamble
19  
-
20  
-  The licenses for most software are designed to take away your
21  
-freedom to share and change it.  By contrast, the GNU General Public
22  
-License is intended to guarantee your freedom to share and change free
23  
-software--to make sure the software is free for all its users.  This
24  
-General Public License applies to most of the Free Software
25  
-Foundation's software and to any other program whose authors commit to
26  
-using it.  (Some other Free Software Foundation software is covered by
27  
-the GNU Library General Public License instead.)  You can apply it to
28  
-your programs, too.
29  
-
30  
-  When we speak of free software, we are referring to freedom, not
31  
-price.  Our General Public Licenses are designed to make sure that you
32  
-have the freedom to distribute copies of free software (and charge for
33  
-this service if you wish), that you receive source code or can get it
34  
-if you want it, that you can change the software or use pieces of it
35  
-in new free programs; and that you know you can do these things.
36  
-
37  
-  To protect your rights, we need to make restrictions that forbid
38  
-anyone to deny you these rights or to ask you to surrender the rights.
39  
-These restrictions translate to certain responsibilities for you if you
40  
-distribute copies of the software, or if you modify it.
41  
-
42  
-  For example, if you distribute copies of such a program, whether
43  
-gratis or for a fee, you must give the recipients all the rights that
44  
-you have.  You must make sure that they, too, receive or can get the
45  
-source code.  And you must show them these terms so they know their
46  
-rights.
47  
-
48  
-  We protect your rights with two steps: (1) copyright the software, and
49  
-(2) offer you this license which gives you legal permission to copy,
50  
-distribute and/or modify the software.
51  
-
52  
-  Also, for each author's protection and ours, we want to make certain
53  
-that everyone understands that there is no warranty for this free
54  
-software.  If the software is modified by someone else and passed on, we
55  
-want its recipients to know that what they have is not the original, so
56  
-that any problems introduced by others will not reflect on the original
57  
-authors' reputations.
58  
-
59  
-  Finally, any free program is threatened constantly by software
60  
-patents.  We wish to avoid the danger that redistributors of a free
61  
-program will individually obtain patent licenses, in effect making the
62  
-program proprietary.  To prevent this, we have made it clear that any
63  
-patent must be licensed for everyone's free use or not licensed at all.
64  
-
65  
-  The precise terms and conditions for copying, distribution and
66  
-modification follow.
67  
-
68  
-		    GNU GENERAL PUBLIC LICENSE
69  
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
70  
-
71  
-  0. This License applies to any program or other work which contains
72  
-a notice placed by the copyright holder saying it may be distributed
73  
-under the terms of this General Public License.  The "Program", below,
74  
-refers to any such program or work, and a "work based on the Program"
75  
-means either the Program or any derivative work under copyright law:
76  
-that is to say, a work containing the Program or a portion of it,
77  
-either verbatim or with modifications and/or translated into another
78  
-language.  (Hereinafter, translation is included without limitation in
79  
-the term "modification".)  Each licensee is addressed as "you".
80  
-
81  
-Activities other than copying, distribution and modification are not
82  
-covered by this License; they are outside its scope.  The act of
83  
-running the Program is not restricted, and the output from the Program
84  
-is covered only if its contents constitute a work based on the
85  
-Program (independent of having been made by running the Program).
86  
-Whether that is true depends on what the Program does.
87  
-
88  
-  1. You may copy and distribute verbatim copies of the Program's
89  
-source code as you receive it, in any medium, provided that you
90  
-conspicuously and appropriately publish on each copy an appropriate
91  
-copyright notice and disclaimer of warranty; keep intact all the
92  
-notices that refer to this License and to the absence of any warranty;
93  
-and give any other recipients of the Program a copy of this License
94  
-along with the Program.
95  
-
96  
-You may charge a fee for the physical act of transferring a copy, and
97  
-you may at your option offer warranty protection in exchange for a fee.
98  
-
99  
-  2. You may modify your copy or copies of the Program or any portion
100  
-of it, thus forming a work based on the Program, and copy and
101  
-distribute such modifications or work under the terms of Section 1
102  
-above, provided that you also meet all of these conditions:
103  
-
104  
-    a) You must cause the modified files to carry prominent notices
105  
-    stating that you changed the files and the date of any change.
106  
-
107  
-    b) You must cause any work that you distribute or publish, that in
108  
-    whole or in part contains or is derived from the Program or any
109  
-    part thereof, to be licensed as a whole at no charge to all third
110  
-    parties under the terms of this License.
111  
-
112  
-    c) If the modified program normally reads commands interactively
113  
-    when run, you must cause it, when started running for such
114  
-    interactive use in the most ordinary way, to print or display an
115  
-    announcement including an appropriate copyright notice and a
116  
-    notice that there is no warranty (or else, saying that you provide
117  
-    a warranty) and that users may redistribute the program under
118  
-    these conditions, and telling the user how to view a copy of this
119  
-    License.  (Exception: if the Program itself is interactive but
120  
-    does not normally print such an announcement, your work based on
121  
-    the Program is not required to print an announcement.)
122  
-
123  
-These requirements apply to the modified work as a whole.  If
124  
-identifiable sections of that work are not derived from the Program,
125  
-and can be reasonably considered independent and separate works in
126  
-themselves, then this License, and its terms, do not apply to those
127  
-sections when you distribute them as separate works.  But when you
128  
-distribute the same sections as part of a whole which is a work based
129  
-on the Program, the distribution of the whole must be on the terms of
130  
-this License, whose permissions for other licensees extend to the
131  
-entire whole, and thus to each and every part regardless of who wrote it.
132  
-
133  
-Thus, it is not the intent of this section to claim rights or contest
134  
-your rights to work written entirely by you; rather, the intent is to
135  
-exercise the right to control the distribution of derivative or
136  
-collective works based on the Program.
137  
-
138  
-In addition, mere aggregation of another work not based on the Program
139  
-with the Program (or with a work based on the Program) on a volume of
140  
-a storage or distribution medium does not bring the other work under
141  
-the scope of this License.
142  
-
143  
-  3. You may copy and distribute the Program (or a work based on it,
144  
-under Section 2) in object code or executable form under the terms of
145  
-Sections 1 and 2 above provided that you also do one of the following:
146  
-
147  
-    a) Accompany it with the complete corresponding machine-readable
148  
-    source code, which must be distributed under the terms of Sections
149  
-    1 and 2 above on a medium customarily used for software interchange; or,
150  
-
151  
-    b) Accompany it with a written offer, valid for at least three
152  
-    years, to give any third party, for a charge no more than your
153  
-    cost of physically performing source distribution, a complete
154  
-    machine-readable copy of the corresponding source code, to be
155  
-    distributed under the terms of Sections 1 and 2 above on a medium
156  
-    customarily used for software interchange; or,
157  
-
158  
-    c) Accompany it with the information you received as to the offer
159  
-    to distribute corresponding source code.  (This alternative is
160  
-    allowed only for noncommercial distribution and only if you
161  
-    received the program in object code or executable form with such
162  
-    an offer, in accord with Subsection b above.)
163  
-
164  
-The source code for a work means the preferred form of the work for
165  
-making modifications to it.  For an executable work, complete source
166  
-code means all the source code for all modules it contains, plus any
167  
-associated interface definition files, plus the scripts used to
168  
-control compilation and installation of the executable.  However, as a
169  
-special exception, the source code distributed need not include
170  
-anything that is normally distributed (in either source or binary
171  
-form) with the major components (compiler, kernel, and so on) of the
172  
-operating system on which the executable runs, unless that component
173  
-itself accompanies the executable.
174  
-
175  
-If distribution of executable or object code is made by offering
176  
-access to copy from a designated place, then offering equivalent
177  
-access to copy the source code from the same place counts as
178  
-distribution of the source code, even though third parties are not
179  
-compelled to copy the source along with the object code.
180  
-
181  
-  4. You may not copy, modify, sublicense, or distribute the Program
182  
-except as expressly provided under this License.  Any attempt
183  
-otherwise to copy, modify, sublicense or distribute the Program is
184  
-void, and will automatically terminate your rights under this License.
185  
-However, parties who have received copies, or rights, from you under
186  
-this License will not have their licenses terminated so long as such
187  
-parties remain in full compliance.
188  
-
189  
-  5. You are not required to accept this License, since you have not
190  
-signed it.  However, nothing else grants you permission to modify or
191  
-distribute the Program or its derivative works.  These actions are
192  
-prohibited by law if you do not accept this License.  Therefore, by
193  
-modifying or distributing the Program (or any work based on the
194  
-Program), you indicate your acceptance of this License to do so, and
195  
-all its terms and conditions for copying, distributing or modifying
196  
-the Program or works based on it.
197  
-
198  
-  6. Each time you redistribute the Program (or any work based on the
199  
-Program), the recipient automatically receives a license from the
200  
-original licensor to copy, distribute or modify the Program subject to
201  
-these terms and conditions.  You may not impose any further
202  
-restrictions on the recipients' exercise of the rights granted herein.
203  
-You are not responsible for enforcing compliance by third parties to
204  
-this License.
205  
-
206  
-  7. If, as a consequence of a court judgment or allegation of patent
207  
-infringement or for any other reason (not limited to patent issues),
208  
-conditions are imposed on you (whether by court order, agreement or
209  
-otherwise) that contradict the conditions of this License, they do not
210  
-excuse you from the conditions of this License.  If you cannot
211  
-distribute so as to satisfy simultaneously your obligations under this
212  
-License and any other pertinent obligations, then as a consequence you
213  
-may not distribute the Program at all.  For example, if a patent
214  
-license would not permit royalty-free redistribution of the Program by
215  
-all those who receive copies directly or indirectly through you, then
216  
-the only way you could satisfy both it and this License would be to
217  
-refrain entirely from distribution of the Program.
218  
-
219  
-If any portion of this section is held invalid or unenforceable under
220  
-any particular circumstance, the balance of the section is intended to
221  
-apply and the section as a whole is intended to apply in other
222  
-circumstances.
223  
-
224  
-It is not the purpose of this section to induce you to infringe any
225  
-patents or other property right claims or to contest validity of any
226  
-such claims; this section has the sole purpose of protecting the
227  
-integrity of the free software distribution system, which is
228  
-implemented by public license practices.  Many people have made
229  
-generous contributions to the wide range of software distributed
230  
-through that system in reliance on consistent application of that
231  
-system; it is up to the author/donor to decide if he or she is willing
232  
-to distribute software through any other system and a licensee cannot
233  
-impose that choice.
234  
-
235  
-This section is intended to make thoroughly clear what is believed to
236  
-be a consequence of the rest of this License.
237  
-
238  
-  8. If the distribution and/or use of the Program is restricted in
239  
-certain countries either by patents or by copyrighted interfaces, the
240  
-original copyright holder who places the Program under this License
241  
-may add an explicit geographical distribution limitation excluding
242  
-those countries, so that distribution is permitted only in or among
243  
-countries not thus excluded.  In such case, this License incorporates
244  
-the limitation as if written in the body of this License.
245  
-
246  
-  9. The Free Software Foundation may publish revised and/or new versions
247  
-of the General Public License from time to time.  Such new versions will
248  
-be similar in spirit to the present version, but may differ in detail to
249  
-address new problems or concerns.
250  
-
251  
-Each version is given a distinguishing version number.  If the Program
252  
-specifies a version number of this License which applies to it and "any
253  
-later version", you have the option of following the terms and conditions
254  
-either of that version or of any later version published by the Free
255  
-Software Foundation.  If the Program does not specify a version number of
256  
-this License, you may choose any version ever published by the Free Software
257  
-Foundation.
258  
-
259  
-  10. If you wish to incorporate parts of the Program into other free
260  
-programs whose distribution conditions are different, write to the author
261  
-to ask for permission.  For software which is copyrighted by the Free
262  
-Software Foundation, write to the Free Software Foundation; we sometimes
263  
-make exceptions for this.  Our decision will be guided by the two goals
264  
-of preserving the free status of all derivatives of our free software and
265  
-of promoting the sharing and reuse of software generally.
266  
-
267  
-			    NO WARRANTY
268  
-
269  
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
270  
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
271  
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
272  
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
273  
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
274  
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
275  
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
276  
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
277  
-REPAIR OR CORRECTION.
278  
-
279  
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
280  
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
281  
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
282  
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
283  
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
284  
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
285  
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
286  
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
287  
-POSSIBILITY OF SUCH DAMAGES.
288  
-
289  
-		     END OF TERMS AND CONDITIONS
290  
-
291  
-	    How to Apply These Terms to Your New Programs
292  
-
293  
-  If you develop a new program, and you want it to be of the greatest
294  
-possible use to the public, the best way to achieve this is to make it
295  
-free software which everyone can redistribute and change under these terms.
296  
-
297  
-  To do so, attach the following notices to the program.  It is safest
298  
-to attach them to the start of each source file to most effectively
299  
-convey the exclusion of warranty; and each file should have at least
300  
-the "copyright" line and a pointer to where the full notice is found.
301  
-
302  
-    <one line to give the program's name and a brief idea of what it does.>
303  
-    Copyright (C) <year>  <name of author>
304  
-
305  
-    This program is free software; you can redistribute it and/or modify
306  
-    it under the terms of the GNU General Public License as published by
307  
-    the Free Software Foundation; either version 2 of the License, or
308  
-    (at your option) any later version.
309  
-
310  
-    This program is distributed in the hope that it will be useful,
311  
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
312  
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
313  
-    GNU General Public License for more details.
314  
-
315  
-    You should have received a copy of the GNU General Public License
316  
-    along with this program; if not, write to the Free Software
317  
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
318  
-
319  
-
320  
-Also add information on how to contact you by electronic and paper mail.
321  
-
322  
-If the program is interactive, make it output a short notice like this
323  
-when it starts in an interactive mode:
324  
-
325  
-    Gnomovision version 69, Copyright (C) year name of author
326  
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
327  
-    This is free software, and you are welcome to redistribute it
328  
-    under certain conditions; type `show c' for details.
329  
-
330  
-The hypothetical commands `show w' and `show c' should show the appropriate
331  
-parts of the General Public License.  Of course, the commands you use may
332  
-be called something other than `show w' and `show c'; they could even be
333  
-mouse-clicks or menu items--whatever suits your program.
334  
-
335  
-You should also get your employer (if you work as a programmer) or your
336  
-school, if any, to sign a "copyright disclaimer" for the program, if
337  
-necessary.  Here is a sample; alter the names:
338  
-
339  
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
340  
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
341  
-
342  
-  <signature of Ty Coon>, 1 April 1989
343  
-  Ty Coon, President of Vice
344  
-
345  
-This General Public License does not permit incorporating your program into
346  
-proprietary programs.  If your program is a subroutine library, you may
347  
-consider it more useful to permit linking proprietary applications with the
348  
-library.  If this is what you want to do, use the GNU Library General
349  
-Public License instead of this License.
  1
+Copyright (c) 2003, Danga Interactive, Inc.
  2
+All rights reserved.
  3
+
  4
+Redistribution and use in source and binary forms, with or without
  5
+modification, are permitted provided that the following conditions are
  6
+met:
  7
+
  8
+    * Redistributions of source code must retain the above copyright
  9
+notice, this list of conditions and the following disclaimer.
  10
+
  11
+    * Redistributions in binary form must reproduce the above
  12
+copyright notice, this list of conditions and the following disclaimer
  13
+in the documentation and/or other materials provided with the
  14
+distribution.
  15
+
  16
+    * Neither the name of the Danga Interactive nor the names of its
  17
+contributors may be used to endorse or promote products derived from
  18
+this software without specific prior written permission.
  19
+
  20
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  21
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  22
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  23
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  24
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  25
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  26
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  27
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  28
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  29
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  30
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
90  memcached.c
@@ -6,7 +6,8 @@
6 6
  *
7 7
  *  Copyright 2003 Danga Interactive, Inc.  All rights reserved.
8 8
  *
9  
- *  Use and distribution licensed under the GNU General Public License (GPL)
  9
+ *  Use and distribution licensed under the BSD license.  See
  10
+ *  the LICENSE file for full text.
10 11
  *
11 12
  *  Authors:
12 13
  *      Anatoly Vorobey <mellon@pobox.com>
@@ -92,7 +93,6 @@ void settings_init(void) {
92 93
     settings.port = 11211;
93 94
     settings.interface.s_addr = htonl(INADDR_ANY);
94 95
     settings.maxbytes = 64*1024*1024; /* default is 64MB */
95  
-    settings.maxitems = 0;            /* no limit on no. of items by default */
96 96
     settings.maxconns = 1024;         /* to limit connections-related memory to about 5MB */
97 97
     settings.verbose = 0;
98 98
 }
@@ -311,7 +311,6 @@ void process_stat(conn *c, char *command) {
311 311
         pos += sprintf(pos, "STAT bytes_read %llu\r\n", stats.bytes_read);
312 312
         pos += sprintf(pos, "STAT bytes_written %llu\r\n", stats.bytes_written);
313 313
         pos += sprintf(pos, "STAT limit_maxbytes %llu\r\n", settings.maxbytes);
314  
-        pos += sprintf(pos, "STAT limit_maxitems %u\r\n", settings.maxitems);
315 314
         pos += sprintf(pos, "END");
316 315
         out_string(c, temp);
317 316
         return;
@@ -1065,20 +1064,91 @@ void delete_handler(int fd, short which, void *arg) {
1065 1064
 }
1066 1065
         
1067 1066
 void usage(void) {
1068  
-    printf(PACKAGE " " VERSION ".\n");
  1067
+    printf(PACKAGE " " VERSION "\n");
1069 1068
     printf("-p <num>      port number to listen on\n");
1070 1069
     printf("-l <ip_addr>  interface to listen on, default is INDRR_ANY\n");
1071  
-    printf("-s <num>      maximum number of items to store, default is unlimited\n");
  1070
+    printf("-d            run as a daemon\n");
1072 1071
     printf("-m <num>      max memory to use for items in megabytes, default is 64 MB\n");
1073 1072
     printf("-c <num>      max simultaneous connections, default is 1024\n");
1074 1073
     printf("-k            lock down all paged memory\n");
1075 1074
     printf("-v            verbose (print errors/warnings while in event loop)\n");
1076  
-    printf("-d            run as a daemon\n");
1077 1075
     printf("-h            print this help and exit\n");
  1076
+    printf("-i            print memcached and libevent license\n");
  1077
+    return;
  1078
+}
  1079
+
  1080
+void usage_license(void) {
  1081
+    printf(PACKAGE " " VERSION "\n\n");
  1082
+    printf(
  1083
+	"Copyright (c) 2003, Danga Interactive, Inc. <http://www.danga.com/>\n"
  1084
+	"All rights reserved.\n"
  1085
+	"\n"
  1086
+	"Redistribution and use in source and binary forms, with or without\n"
  1087
+	"modification, are permitted provided that the following conditions are\n"
  1088
+	"met:\n"
  1089
+	"\n"
  1090
+	"    * Redistributions of source code must retain the above copyright\n"
  1091
+	"notice, this list of conditions and the following disclaimer.\n"
  1092
+	"\n"
  1093
+	"    * Redistributions in binary form must reproduce the above\n"
  1094
+	"copyright notice, this list of conditions and the following disclaimer\n"
  1095
+	"in the documentation and/or other materials provided with the\n"
  1096
+	"distribution.\n"
  1097
+	"\n"
  1098
+	"    * Neither the name of the Danga Interactive nor the names of its\n"
  1099
+	"contributors may be used to endorse or promote products derived from\n"
  1100
+	"this software without specific prior written permission.\n"
  1101
+	"\n"
  1102
+	"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n"
  1103
+	"\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n"
  1104
+	"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n"
  1105
+	"A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n"
  1106
+	"OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n"
  1107
+	"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n"
  1108
+	"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
  1109
+	"DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
  1110
+	"THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
  1111
+	"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n"
  1112
+	"OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
  1113
+	"\n"
  1114
+	"\n"
  1115
+	"This product includes software developed by Niels Provos.\n"
  1116
+	"\n"
  1117
+	"[ libevent ]\n"
  1118
+	"\n"
  1119
+	"Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>\n"
  1120
+	"All rights reserved.\n"
  1121
+	"\n"
  1122
+	"Redistribution and use in source and binary forms, with or without\n"
  1123
+	"modification, are permitted provided that the following conditions\n"
  1124
+	"are met:\n"
  1125
+	"1. Redistributions of source code must retain the above copyright\n"
  1126
+	"   notice, this list of conditions and the following disclaimer.\n"
  1127
+	"2. Redistributions in binary form must reproduce the above copyright\n"
  1128
+	"   notice, this list of conditions and the following disclaimer in the\n"
  1129
+	"   documentation and/or other materials provided with the distribution.\n"
  1130
+	"3. All advertising materials mentioning features or use of this software\n"
  1131
+	"   must display the following acknowledgement:\n"
  1132
+	"      This product includes software developed by Niels Provos.\n"
  1133
+	"4. The name of the author may not be used to endorse or promote products\n"
  1134
+	"   derived from this software without specific prior written permission.\n"
  1135
+	"\n"
  1136
+	"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
  1137
+	"IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n"
  1138
+	"OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n"
  1139
+	"IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n"
  1140
+	"INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n"
  1141
+	"NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
  1142
+	"DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
  1143
+	"THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
  1144
+	"(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n"
  1145
+	"THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
  1146
+    );
1078 1147
 
1079 1148
     return;
1080 1149
 }
1081 1150
 
  1151
+
1082 1152
 int main (int argc, char **argv) {
1083 1153
     int c;
1084 1154
     int l_socket;
@@ -1091,14 +1161,11 @@ int main (int argc, char **argv) {
1091 1161
     settings_init();
1092 1162
 
1093 1163
     /* process arguments */
1094  
-    while ((c = getopt(argc, argv, "p:s:m:c:khvdl:")) != -1) {
  1164
+    while ((c = getopt(argc, argv, "p:m:c:khivdl:")) != -1) {
1095 1165
         switch (c) {
1096 1166
         case 'p':
1097 1167
             settings.port = atoi(optarg);
1098 1168
             break;
1099  
-        case 's':
1100  
-            settings.maxitems = atoi(optarg);
1101  
-            break;
1102 1169
         case 'm':
1103 1170
             settings.maxbytes = atoi(optarg)*1024*1024;
1104 1171
             break;
@@ -1108,6 +1175,9 @@ int main (int argc, char **argv) {
1108 1175
         case 'h':
1109 1176
             usage();
1110 1177
             exit(0);
  1178
+        case 'i':
  1179
+            usage_license();
  1180
+            exit(0);
1111 1181
         case 'k':
1112 1182
             lock_memory = 1;
1113 1183
             break;
1  memcached.h
@@ -20,7 +20,6 @@ struct stats {
20 20
 
21 21
 struct settings {
22 22
     unsigned long long maxbytes;
23  
-    int maxitems;
24 23
     int maxconns;
25 24
     int port;
26 25
     struct in_addr interface;

0 notes on commit 0c3b47f

Please sign in to comment.
Something went wrong with that request. Please try again.