<<<<<<< HEAD
								//DEBUG( "Ok, lets see about that string\n" );
								BOOL both = request->content && request->uri->queryRaw ? TRUE : FALSE;
								if( request->content != NULL ) size += strlen( request->content );
								if( request->uri->queryRaw != NULL ) size += strlen( request->uri->queryRaw );
								//DEBUG( "Putting them in a combined string\n" );

								int fullsize = size + ( both ? 2 : 1 );
								char *allArgs = calloc( 1, fullsize );
								char *allArgsNew = calloc( 1, fullsize+100 );

								if( both == TRUE )
									sprintf( allArgs, "%s&%s", request->content, request->uri->queryRaw );
								else if( request->content )
									sprintf( allArgs, "%s", request->content );
								else sprintf( allArgs, "%s", request->uri->queryRaw );
								//DEBUG( "Put them together: %s\n", allArgs );

								char *sessptr = NULL;
								if( ( sessptr = strstr( allArgs, "sessionid" ) ) != NULL )
								{
									int i=0;
									int j=0;
									//int overwrite = 0;

									//int startpos = (sessptr - allArgs) + 10; // end of sessionid text + =
									int startpos = (sessptr - allArgs);
									/*
									int endpos = 0;
									for( endpos = startpos ; endpos < size ; i++ )
									{
										if( allArgs[ i ] == '&' )
										{
											break;
										}
									}*/

									BOOL overwrite = FALSE;
									for( i=0 ; i < fullsize ; i++ )
									{
										if( i >= startpos && overwrite == FALSE )
										{
											char tmp[ 255 ];

											if( allArgs[ i ] == '&' )
											{
												j += sprintf( tmp, "sessionid=%s&", loggedSession->us_MasterSession );
												strcat( allArgsNew, tmp );
												overwrite = TRUE;
											}
											if( i == fullsize - 1 )
											{
												j += sprintf( tmp, "sessionid=%s", loggedSession->us_MasterSession );
												strcat( allArgsNew, tmp );
												overwrite = TRUE;
											}
										}
										else
										{
											allArgsNew[ j ] = allArgs[ i ];
											j++;
										}
									}
									/*


									DEBUG(" pos %d  lastpos %d   -----> %s    ---- mastersessionptr %p\n", pos, i, allArgs, loggedSession->us_MasterSession );

									sprintf( allArgsNew, "sessionid=%s&", loggedSession->us_MasterSession );

									// text is on the front
									if( sessptr != allArgs )
									{
										strncat( allArgsNew, allArgs, (sessptr - allArgs) );
									}

									//{


									// add last part
									if( (i+1) < fullsize )
									{
										strcat( allArgsNew, &(allArgs[ i+1]) );
									}*/
									//}
								}
								else
								{
									strcpy( allArgsNew, allArgs );
								}

								ERROR("ALLAGRS  \n\n\n\n\n %s\n\n%s\n\n", allArgs, allArgsNew );
=======
								char *allArgs = NULL;

								if( request->h_RequestSource == HTTP_SOURCE_HTTP )
								{
									//DEBUG( "Ok, lets see about that string\n" );
									BOOL both = request->content && request->uri->queryRaw ? TRUE : FALSE;
									if( request->content != NULL ) size += strlen( request->content );
									if( request->uri->queryRaw != NULL ) size += strlen( request->uri->queryRaw );
									//DEBUG( "Putting them in a combined string\n" );
									allArgs = calloc( 1, size + ( both ? 2 : 1 ) );
									if( both == TRUE )
										sprintf( allArgs, "%s&%s", request->content, request->uri->queryRaw );
									else if( request->content )
										sprintf( allArgs, "%s", request->content );
										else sprintf( allArgs, "%s", request->uri->queryRaw );
									//DEBUG( "Put them together: %s\n", allArgs );
								}
								else
								{
									int i;

									for( ; i < request->parsedPostContent->table_size; i++ )
									{
										HashmapElement e;
										e = request->parsedPostContent->data[i];
										if( e.inUse == TRUE )
										{
											if( e.data != NULL )
											{
												size += strlen( e.data );
											}
											if( e.key  != NULL )
											{
												size += strlen( e.key );
											}

											size += 10;
										}
									}

									if( size > 0 )
									{
										if( ( allArgs = calloc( size, sizeof(char) ) ) != NULL )
										{
											i = 0;
											for( ; i < request->parsedPostContent->table_size; i++ )
											{
												HashmapElement e;
												e = request->parsedPostContent->data[i];
												if( e.inUse == TRUE )
												{
													if( allArgs[0] != 0 )
													{
														strcat( allArgs, "&" );
													}

													if( e.key  != NULL )
													{
														strcat( allArgs, e.key );
													}

													if( e.data != NULL )
													{
														strcat( allArgs, "=" );
														strcat( allArgs, e.data );
													}
												}
											}
										}
									}
								}

								DEBUG("All args %s\n", allArgs );

>>>>>>> bf5ec30dca5a31a62674fd2e23e01c0b5a6b4f01