github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-08-24 07:05:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/e2002e/thc-hydra

Browse source
This commit is contained in:
yvain douard 2021-03-13 04:34:09 -10:00
commit bf9116f480
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bfg.c
View file

@ -1,6 +1,8 @@
/* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh, /* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh,
<<<<<<< HEAD
rainy tweaks by yvain douard*/ rainy tweaks by yvain douard*/
rainy tweaks by owein <yvain29@gmail.com>*/
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>

12
hydra-http-form.c
View file

@ -1284,10 +1284,22 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
*ptr++ = 0; *ptr++ = 0;
cond = ptr; cond = ptr;
<<<<<<< HEAD
while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\')) while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\'))
ptr++; ptr++;
if (*ptr != 0) if (*ptr != 0)
*ptr++ = 0; *ptr++ = 0;
=======
if ((ptr2 = index(ptr, ':')) != NULL) {
*ptr2++ = 0;
if (*ptr2)
optional1 = ptr2;
else
optional1 = NULL;
} else
optional1 = NULL;
>>>>>>> 6fc51db156b0f0dc533941bb24aa4f24f07f2124
optional1 = ptr; optional1 = ptr;
if (strstr(url, "\\:") != NULL) { if (strstr(url, "\\:") != NULL) {