Skip to content

Commit 56653a5

Browse files
fixup! fix(qgisserver): suppress wait in fcgi response destructor
1 parent 1e68718 commit 56653a5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/server/qgsfcgiserverresponse.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef struct QgsFCGXStreamData
5454
} QgsFCGXStreamData;
5555
#endif
5656

57-
QgsSocketMonitoringThread::QgsSocketMonitoringThread( QgsFeedback *feedback )
57+
QgsSocketMonitoringThread::QgsSocketMonitoringThread( std::shared_ptr<QgsFeedback> feedback )
5858
: mFeedback( feedback )
5959
, mIpcFd( -1 )
6060
{

src/server/qgsfcgiserverresponse.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class QgsSocketMonitoringThread: public QThread
4545
* \param isResponseFinished
4646
* \param feedback
4747
*/
48-
QgsSocketMonitoringThread( QgsFeedback *feedback );
48+
QgsSocketMonitoringThread( std::shared_ptr<QgsFeedback> feedback );
4949
void run( );
5050

5151
void setResponseFinished( bool responseFinished );
5252

5353
private:
5454
bool mIsResponseFinished = false;
55-
QgsFeedback *mFeedback = nullptr;
55+
std::shared_ptr<QgsFeedback> mFeedback;
5656
int mIpcFd = -1;
5757
};
5858

@@ -123,7 +123,7 @@ class SERVER_EXPORT QgsFcgiServerResponse: public QgsServerResponse
123123
int mStatusCode = 0;
124124

125125
QgsSocketMonitoringThread *mSocketMonitoringThread;
126-
std::unique_ptr<QgsFeedback> mFeedback;
126+
std::shared_ptr<QgsFeedback> mFeedback;
127127
};
128128

129129
#endif

0 commit comments

Comments
 (0)