Skip to content

Commit 6083a2e

Browse files
petkAyesh
authored andcommitted
Autotools: Fix pdo_mysql build with mysql client library (#15450)
When using --with-pdo-mysql=DIR and for some reason DIR wouldn't have the executable DIR/bin/mysql_config available the 3rd option was so far to guess the mysql client library locations and pass the include directory further. The library directory and library name to link was missing. This fixes this case for consistency reasons. And in the future also the pkg-config could be a reliable alternative to mysql_config in that case. The PDO_MYSQL_INC_DIR is already processed PHP_EVAL_INCLINE so redundant PHP_ADD_INCLUDE is removed.
1 parent 5ed1659 commit 6083a2e

File tree

5 files changed

+18
-4
lines changed

5 files changed

+18
-4
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ PHP NEWS
3232
EAI_SYSTEM not found). (nielsdos)
3333
. Implemented asymmetric visibility for properties. (ilutov)
3434

35+
- Curl:
36+
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
37+
CURLOPT_FTP_RESPONSE_TIMEOUT. (Ayesh Karunaratne)
38+
3539
- Date:
3640
. Fixed bug GH-13773 (DatePeriod not taking into account microseconds for end
3741
date). (Mark Bennewitz, Derick)

UPGRADING

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ PHP 8.4 UPGRADE NOTES
292292
supported (true) or not (false).
293293
. Added CURL_HTTP_VERSION_3 and CURL_HTTP_VERSION_3ONLY constants (available
294294
since libcurl 7.66 and 7.88) as available options for CURLOPT_HTTP_VERSION.
295+
. Added CURLOPT_SERVER_RESPONSE_TIMEOUT, which was formerly known as
296+
CURLOPT_FTP_RESPONSE_TIMEOUT. Both constants hold the same value.
295297

296298
- Date:
297299
. Added static methods
@@ -996,6 +998,7 @@ PHP 8.4 UPGRADE NOTES
996998
. CURL_HTTP_VERSION_3.
997999
. CURL_HTTP_VERSION_3ONLY.
9981000
. CURL_TCP_KEEPCNT
1001+
. CURLOPT_SERVER_RESPONSE_TIMEOUT.
9991002

10001003
- Intl:
10011004
. The IntlDateFormatter class exposes now the new PATTERN constant

ext/curl/curl.stub.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,9 +1291,15 @@
12911291
const CURLINFO_PROXYAUTH_AVAIL = UNKNOWN;
12921292
/**
12931293
* @var int
1294-
* @cvalue CURLOPT_FTP_RESPONSE_TIMEOUT
1294+
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
1295+
* @alias CURLOPT_SERVER_RESPONSE_TIMEOUT
12951296
*/
12961297
const CURLOPT_FTP_RESPONSE_TIMEOUT = UNKNOWN;
1298+
/**
1299+
* @var int
1300+
* @cvalue CURLOPT_SERVER_RESPONSE_TIMEOUT
1301+
*/
1302+
const CURLOPT_SERVER_RESPONSE_TIMEOUT = UNKNOWN;
12971303
/**
12981304
* @var int
12991305
* @cvalue CURLOPT_IPRESOLVE

ext/curl/curl_arginfo.h

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/curl/interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,7 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
16951695
case CURLOPT_HTTPAUTH:
16961696
case CURLOPT_FTP_CREATE_MISSING_DIRS:
16971697
case CURLOPT_PROXYAUTH:
1698-
case CURLOPT_FTP_RESPONSE_TIMEOUT:
1698+
case CURLOPT_SERVER_RESPONSE_TIMEOUT:
16991699
case CURLOPT_IPRESOLVE:
17001700
case CURLOPT_MAXFILESIZE:
17011701
case CURLOPT_TCP_NODELAY:

0 commit comments

Comments
 (0)