+2013-04-24 Darshit Shah <darnir@gmail.com>
+
+ * http.c (gethttp): Remove check for opt.post_data and
+ opt.post_file_name.
+ * main.c (main): Change location in code where --post-data and
+ --post-file options are converted to --body-data --body-file.
+
2013-04-21 Gijs van Tulder <gvtulder@gmail.com>
* http.c: Copy opt.body_data to the WARC file, instead of
if (opt.verbose == -1)
opt.verbose = !opt.quiet;
- if (opt.post_data || opt.post_file_name)
- {
- setoptval ("method", "POST", "method");
- if (opt.post_data)
- {
- setoptval ("bodydata", opt.post_data, "body-data");
- opt.post_data = NULL;
- }
- else
- {
- setoptval ("bodyfile", opt.post_file_name, "body-file");
- opt.post_file_name = NULL;
- }
- }
/* Sanity checks. */
if (opt.verbose && opt.quiet)
}
}
+ /* Convert post_data to body-data and post_file_name to body-file options.
+ This is required so as to remove redundant code later on in gethttp().
+ The --post-data and --post-file options may also be removed in
+ the future hence it makes sense to convert them to aliases for
+ the more generic --method options.
+ This MUST occur only after the sanity checks so as to prevent the
+ user from setting both post and body options simultaneously.
+ */
+ if (opt.post_data || opt.post_file_name)
+ {
+ setoptval ("method", "POST", "method");
+ if (opt.post_data)
+ {
+ setoptval ("bodydata", opt.post_data, "body-data");
+ opt.post_data = NULL;
+ }
+ else
+ {
+ setoptval ("bodyfile", opt.post_file_name, "body-file");
+ opt.post_file_name = NULL;
+ }
+ }
+
#ifdef ENABLE_IRI
if (opt.enable_iri)
{