Attachment #85 for bug #494

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 494
Collapse All | Expand All

Lines 256-261 Link Here

(-)kdebase/nsplugins/sdk/npapi.h (+25 lines)
256	uint32 end;	256	uint32 end;
257	uint32 lastmodified;	257	uint32 lastmodified;
258	void* notifyData;	258	void* notifyData;
		259	const char* headers; /* Response headers from host.
		260	* Exists only for >= NPVERS_HAS_RESPONSE_HEADERS.
		261	* Used for HTTP only; NULL for non-HTTP.
		262	* Available from NPP_NewStream onwards.
		263	* Plugin should copy this data before storing it.
		264	* Includes HTTP status line and all headers,
		265	* preferably verbatim as received from server,
		266	* headers formatted as in HTTP ("Header: Value"),
		267	* and newlines (\n, NOT \r\n) separating lines.
		268	* Terminated by \n\0 (NOT \n\n\0). */
259	} NPStream;	269	} NPStream;
260		270
261		271
Lines 602-607 Link Here
602	#define NPVERS_68K_HAS_LIVECONNECT 11	612	#define NPVERS_68K_HAS_LIVECONNECT 11
603	#define NPVERS_HAS_WINDOWLESS 11	613	#define NPVERS_HAS_WINDOWLESS 11
604	#define NPVERS_HAS_XPCONNECT_SCRIPTING 13	614	#define NPVERS_HAS_XPCONNECT_SCRIPTING 13
		615	// Trinity note: we claim 13 right now, though we do
		616	// have response_headers.
		617	#define NPVERS_HAS_NPRUNTIME_SCRIPTING 14
		618	#define NPVERS_HAS_FORM_VALUES 15
		619	#define NPVERS_HAS_POPUPS_ENABLED_STATE 16
		620	#define NPVERS_HAS_RESPONSE_HEADERS 17
		621	#define NPVERS_HAS_NPOBJECT_ENUM 18
		622	#define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19
		623	#define NPVERS_HAS_ALL_NETWORK_STREAMS 20
		624	#define NPVERS_HAS_URL_AND_AUTH_INFO 21
		625	#define NPVERS_HAS_PRIVATE_MODE 22
		626	#define NPVERS_MACOSX_HAS_COCOA_EVENTS 23
		627	#define NPVERS_HAS_ADVANCED_KEY_HANDLING 25
		628	#define NPVERS_HAS_URL_REDIRECT_HANDLING 26
		629	#define NPVERS_HAS_CLEAR_SITE_DATA 27
605		630
606	/----------------------------------------------------------------------/	631	/----------------------------------------------------------------------/
607	/* Function Prototypes */	632	/* Function Prototypes */




    _stream->pdata = 0;
    _stream->lastmodified = 0;
    _stream->notifyData = _notifyData;
    _stream->headers = 0;

    _mimeType = mimeType;


        _job = KIO::get(KURL( url ), false, false);
        _job->addMetaData("errorPage", "false");
        _job->addMetaData("AllowCompressedPage", "false");
        _job->addMetaData("PropagateHttpHeader", "true");
        if (reload) {
            _job->addMetaData("cache", "reload");
        }

        _job = KIO::http_post(KURL( url ), data, false);
        _job->addMetaData("content-type", args.contentType());
        _job->addMetaData("errorPage", "false");
        _job->addMetaData("PropagateHttpHeader", "true");
        _job->addMetaData("AllowCompressedPage", "false");
        connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
                TQT_SLOT(data(KIO::Job *, const TQByteArray &)));


void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType)
{
    kdDebug(1431) << "NSPluginStream::mimetype - job=" << (void*)job << " mimeType=" << mimeType << endl;
    _mimeType = mimeType;
    TQString tmp_headers = job->metaData()["HTTP-Headers"];
    _headers.duplicate(tmp_headers.latin1(), tmp_headers.length());
    _stream->headers = _headers.data();
}




void NSPluginStream::resume()
{
   if ( error() || tries()>8 ) {

Lines 95-100 Link Here

(-)kdebase/nsplugins/viewer/nsplugin.h (+1 lines)
95	KURL _url;	95	KURL _url;
96	TQString _fileURL;	96	TQString _fileURL;
97	TQString _mimeType;	97	TQString _mimeType;
		98	TQByteArray _headers;
98	TQByteArray _data;	99	TQByteArray _data;
99	class KTempFile *_tempFile;	100	class KTempFile *_tempFile;
100		101

Return to bug 494

Lines 1674-1679 Link Here

(-)kdebase/nsplugins/viewer/nsplugin.cpp (-4 / +7 lines)
1674	_stream->pdata = 0;	1674	_stream->pdata = 0;
1675	_stream->lastmodified = 0;	1675	_stream->lastmodified = 0;
1676	_stream->notifyData = _notifyData;	1676	_stream->notifyData = _notifyData;
		1677	_stream->headers = 0;
1677		1678
1678	_mimeType = mimeType;	1679	_mimeType = mimeType;
1679		1680
Lines 1898-1903 Link Here
1898	_job = KIO::get(KURL( url ), false, false);	1899	_job = KIO::get(KURL( url ), false, false);
1899	_job->addMetaData("errorPage", "false");	1900	_job->addMetaData("errorPage", "false");
1900	_job->addMetaData("AllowCompressedPage", "false");	1901	_job->addMetaData("AllowCompressedPage", "false");
		1902	_job->addMetaData("PropagateHttpHeader", "true");
1901	if (reload) {	1903	if (reload) {
1902	_job->addMetaData("cache", "reload");	1904	_job->addMetaData("cache", "reload");
1903	}	1905	}
Lines 1925-1930 Link Here
1925	_job = KIO::http_post(KURL( url ), data, false);	1927	_job = KIO::http_post(KURL( url ), data, false);
1926	_job->addMetaData("content-type", args.contentType());	1928	_job->addMetaData("content-type", args.contentType());
1927	_job->addMetaData("errorPage", "false");	1929	_job->addMetaData("errorPage", "false");
		1930	_job->addMetaData("PropagateHttpHeader", "true");
1928	_job->addMetaData("AllowCompressedPage", "false");	1931	_job->addMetaData("AllowCompressedPage", "false");
1929	connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),	1932	connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
1930	TQT_SLOT(data(KIO::Job *, const TQByteArray &)));	1933	TQT_SLOT(data(KIO::Job *, const TQByteArray &)));
Lines 1964-1976 Link Here
1964		1967
1965	void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType)	1968	void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType)
1966	{	1969	{
1967	kdDebug(1431) << "NSPluginStream::TQByteArray - job=" << (void*)job << " mimeType=" << mimeType << endl;	1970	kdDebug(1431) << "NSPluginStream::mimetype - job=" << (void*)job << " mimeType=" << mimeType << endl;
1968	_mimeType = mimeType;	1971	_mimeType = mimeType;
		1972	TQString tmp_headers = job->metaData()["HTTP-Headers"];
		1973	_headers.duplicate(tmp_headers.latin1(), tmp_headers.length());
		1974	_stream->headers = _headers.data();
1969	}	1975	}
1970		1976
1971
1972
1973
1974	void NSPluginStream::resume()	1977	void NSPluginStream::resume()
1975	{	1978	{
1976	if ( error() \|\| tries()>8 ) {	1979	if ( error() \|\| tries()>8 ) {