mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-04-16 12:35:54 +00:00
367152556a
1. **Fixed XPadding Placement Dropdown**: - Added the missing `cookie` and `query` options to `xPaddingPlacement` (`stream_xhttp.html`). - *Why:* Previously, users wanting `cookie` obfuscation were forced to use the `header` placement string. This caused Xray-core to blindly intercept the entire monolithic HTTP Cookie header, failing internal padding-length validations and causing the inbound to silently drop the connection. 2. **Fixed Uplink Data Placement Validation**: - Replaced the unsupported `query` option with `cookie` in `uplinkDataPlacement`. - *Why:* Xray-core's `transport_internet.go` explicitly forbids `query` as an uplink placement option. Selecting it from the UI previously sent a payload that would cause Xray-core to instantly throw an `unsupported uplink data placement: query` panic. Adding `cookie` perfectly aligns the UI with Xray-core restrictions. ### Related Issues - Resolves #3992
41 lines
955 B
Go
41 lines
955 B
Go
package pipe
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/xtls/xray-core/common/buf"
|
|
)
|
|
|
|
// Reader is a buf.Reader that reads content from a pipe.
|
|
type Reader struct {
|
|
pipe *pipe
|
|
}
|
|
|
|
// ReadMultiBuffer implements buf.Reader.
|
|
func (r *Reader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
|
return r.pipe.ReadMultiBuffer()
|
|
}
|
|
|
|
// ReadMultiBufferTimeout reads content from a pipe within the given duration, or returns buf.ErrTimeout otherwise.
|
|
func (r *Reader) ReadMultiBufferTimeout(d time.Duration) (buf.MultiBuffer, error) {
|
|
return r.pipe.ReadMultiBufferTimeout(d)
|
|
}
|
|
|
|
// Interrupt implements common.Interruptible.
|
|
func (r *Reader) Interrupt() {
|
|
r.pipe.Interrupt()
|
|
}
|
|
|
|
// ReturnAnError makes ReadMultiBuffer return an error, only once.
|
|
func (r *Reader) ReturnAnError(err error) {
|
|
r.pipe.errChan <- err
|
|
}
|
|
|
|
// Recover catches an error set by ReturnAnError, if exists.
|
|
func (r *Reader) Recover() (err error) {
|
|
select {
|
|
case err = <-r.pipe.errChan:
|
|
default:
|
|
}
|
|
return
|
|
}
|